From 3af3b0ad336417fd23c0f6aac3582fc7b540380b Mon Sep 17 00:00:00 2001
From: Paul Meems <p.meems@topx-group.nl>
Date: Fri, 1 Mar 2019 11:15:15 +0100
Subject: [PATCH 01/15] Making v5.4.1

---
 src/SolutionItems/ReleaseNotes.rtf    | 8 +++++---
 src/SolutionItems/SolutionInfoCore.cs | 4 ++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/SolutionItems/ReleaseNotes.rtf b/src/SolutionItems/ReleaseNotes.rtf
index 69fe6785..ae24edfd 100644
--- a/src/SolutionItems/ReleaseNotes.rtf
+++ b/src/SolutionItems/ReleaseNotes.rtf
@@ -1,9 +1,11 @@
 {\rtf1\ansi\ansicpg1252\deff0\nouicompat\deflang1043{\fonttbl{\f0\fnil\fcharset0 Calibri;}{\f1\fnil\fcharset0 Cambria;}{\f2\fnil\fcharset2 Symbol;}}
 {\colortbl ;\red0\green0\blue255;}
 {\*\generator Riched20 10.0.17134}\viewkind4\uc1 
-\pard\sa200\sl276\slmult1\b\f0\fs44\lang19 Release notes for MapWindow 5\line\b0\fs20 Download at {{\field{\*\fldinst{HYPERLINK https://github.com/MapWindow/MapWindow5/releases }}{\fldrslt{https://github.com/MapWindow/MapWindow5/releases\ul0\cf0}}}}\f0\fs20  (since v5.1.1)\par
-\ul\fs44 MW5 v5.4.0\ulnone\line\f1\fs20 Released Jan. 19, 2019\par
-\b News\b0 :\line This is a maintenance release. Only a few issues have been resolved.\line The main reason for this release is the new version of MapWinGIS, which has some improvements. v5.0.0 of MapWinGIS is no using the VC++2015 dependencies.\line The release notes for MapWinGIS v5.0.0 can be found at {{\field{\*\fldinst{HYPERLINK https://mapwindow.atlassian.net/secure/ReleaseNote.jspa?projectId=10003&version=10400 }}{\fldrslt{https://mapwindow.atlassian.net/secure/ReleaseNote.jspa?projectId=10003&version=10400\ul0\cf0}}}}\f1\fs20\par
+\pard\sa200\sl276\slmult1\b\f0\fs44\lang19 Release notes for MapWindow 5\line\b0\fs20 Download at {{\field{\*\fldinst{HYPERLINK https://github.com/MapWindow/MapWindow5/releases }}{\fldrslt{https://github.com/MapWindow/MapWindow5/releases\ul0\cf0}}}}\f0\fs20  (since v5.1.1)\line\f1 We have a new forum: {{\field{\*\fldinst{HYPERLINK https://mapwindow.discourse.group/ }}{\fldrslt{https://mapwindow.discourse.group/\ul0\cf0}}}}\f0\fs20\par
+\ul\fs44 MW5 v5.4.1\ulnone\line\f1\fs20 Released March. 1, 2019\par
+\b News\b0 :\line This is a hotfix due to a bug in MapWinGIS: MWGIS-141: \i Crash when selecting a polygon\i0 .\par
+\line\ul\f0\fs44 MW5 v5.4.0\ulnone\line\f1\fs20 Released Jan. 19, 2019\par
+\b News\b0 :\line This is a maintenance release. Only a few issues have been resolved.\line The main reason for this release is the new version of MapWinGIS, which has some improvements. \line v5.0.0 of MapWinGIS is now using the VC++2015 dependencies.\line The release notes for MapWinGIS v5.0.0 can be found at {{\field{\*\fldinst{HYPERLINK https://mapwindow.atlassian.net/secure/ReleaseNote.jspa?projectId=10003&version=10400 }}{\fldrslt{https://mapwindow.atlassian.net/secure/ReleaseNote.jspa?projectId=10003&version=10400\ul0\cf0}}}}\f1\fs20\par
 \b\f0\fs28 MW5 Core\line\b0\fs20 URL: {{\field{\*\fldinst{HYPERLINK https://mapwindow.atlassian.net/secure/ReleaseNote.jspa?projectId=10002&version=10500 }}{\fldrslt{https://mapwindow.atlassian.net/secure/ReleaseNote.jspa?projectId=10002&version=10500\ul0\cf0}}}}\f0\fs20\par
 \b\f1 Bug fixes\b0\par
 [MW5CORE-211] - WMS url cannot be secure (https)\f0\fs44\par
diff --git a/src/SolutionItems/SolutionInfoCore.cs b/src/SolutionItems/SolutionInfoCore.cs
index d7998e81..ade8ec02 100644
--- a/src/SolutionItems/SolutionInfoCore.cs
+++ b/src/SolutionItems/SolutionInfoCore.cs
@@ -26,5 +26,5 @@
 // COM, set the ComVisible attribute to true on that type.
 [assembly: ComVisible(false)]
 
-[assembly: AssemblyVersion("5.4.0.*")]
-[assembly: AssemblyFileVersion("5.4.0.0")]
\ No newline at end of file
+[assembly: AssemblyVersion("5.4.1.*")]
+[assembly: AssemblyFileVersion("5.4.1.0")]
\ No newline at end of file

From d1b85a911ea6366f56fc14297b65670508b7c925 Mon Sep 17 00:00:00 2001
From: Mathijs Dumon <mathijs.Dumon@gmail.com>
Date: Fri, 14 Dec 2018 13:10:03 +0100
Subject: [PATCH 02/15] MW5CORE-221 Adding segment/vertex snapping options to
 the shape editor context menu and toolbar

---
 .gitignore                                    |   1 +
 src/MW5.Api/Concrete/GeometryEditor.cs        |   8 +-
 src/MW5.Api/Enums/Enums.cs                    |   7 +
 src/MW5.Api/Interfaces/IGeometryEditor.cs     |   1 +
 .../Services/ILayerEditingService.cs          |   4 +
 src/MW5/Helpers/MapInitializer.cs             |   1 +
 .../Context/ContextMenuPresenter.cs           |  29 +-
 .../Context/ContextMenuView.Designer.cs       | 268 +++++++++++-------
 .../Context/ContextMenuView.cs                |  36 ++-
 .../Context/ContextMenuView.resx              |   2 +-
 .../MW5.ShapeEditor/Context/EditorCommand.cs  |   4 +
 .../MW5.ShapeEditor/MW5.ShapeEditor.csproj    |   6 +
 .../MW5.ShapeEditor/Menu/MenuCommands.cs      |   6 +
 .../MW5.ShapeEditor/Menu/MenuGenerator.cs     |  18 +-
 src/Plugins/MW5.ShapeEditor/Menu/MenuKeys.cs  |   5 +
 .../MW5.ShapeEditor/Menu/MenuListener.cs      |  87 ++++--
 .../MW5.ShapeEditor/Menu/MenuUpdater.cs       |  35 ++-
 .../Properties/Resources.Designer.cs          |  42 ++-
 .../MW5.ShapeEditor/Properties/Resources.resx |  68 +++--
 .../Resources/img_snap_active_layer.png       | Bin 0 -> 537 bytes
 .../Resources/img_snap_all_layers.png         | Bin 0 -> 1148 bytes
 .../Resources/img_snap_to_segments.png        | Bin 0 -> 588 bytes
 .../Resources/img_snap_to_vertices.png        | Bin 0 -> 235 bytes
 .../Services/LayerEditingService.cs           |  33 +++
 src/Plugins/MW5.ShapeEditor/ShapeEditor.cs    |   2 +-
 25 files changed, 476 insertions(+), 187 deletions(-)
 create mode 100644 src/Plugins/MW5.ShapeEditor/Resources/img_snap_active_layer.png
 create mode 100644 src/Plugins/MW5.ShapeEditor/Resources/img_snap_all_layers.png
 create mode 100644 src/Plugins/MW5.ShapeEditor/Resources/img_snap_to_segments.png
 create mode 100644 src/Plugins/MW5.ShapeEditor/Resources/img_snap_to_vertices.png

diff --git a/.gitignore b/.gitignore
index aff3d3be..2ebae767 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@
 *.suo
 *.user
 *.sln.docstates
+.vs/
 
 # Build results
 
diff --git a/src/MW5.Api/Concrete/GeometryEditor.cs b/src/MW5.Api/Concrete/GeometryEditor.cs
index dfcbab97..0a056cbe 100644
--- a/src/MW5.Api/Concrete/GeometryEditor.cs
+++ b/src/MW5.Api/Concrete/GeometryEditor.cs
@@ -47,7 +47,13 @@ public LayerSelectionMode HighlightVertices
             get { return (LayerSelectionMode)_editor.HighlightVertices; }
             set { _editor.HighlightVertices = (tkLayerSelection)value; }
         }
-        
+
+        public SnapMode SnapMode
+        {
+            get { return (SnapMode)_editor.SnapMode; }
+            set { _editor.SnapMode = (tkSnapMode) value; }
+        }
+
         public bool IsDigitizing
         {
             get { return _editor.IsDigitizing; }
diff --git a/src/MW5.Api/Enums/Enums.cs b/src/MW5.Api/Enums/Enums.cs
index fb9ddfc8..d24af5fd 100644
--- a/src/MW5.Api/Enums/Enums.cs
+++ b/src/MW5.Api/Enums/Enums.cs
@@ -902,6 +902,13 @@ public enum LayerSelectionMode
         ActiveLayer = 2,
     }
 
+    public enum SnapMode
+    {
+        Vertices = 0,
+        VerticesAndLines = 1,
+        Lines = 2
+    }
+
     public enum LengthDisplay
     {
         Metric = 0,
diff --git a/src/MW5.Api/Interfaces/IGeometryEditor.cs b/src/MW5.Api/Interfaces/IGeometryEditor.cs
index 815d448f..360f5930 100644
--- a/src/MW5.Api/Interfaces/IGeometryEditor.cs
+++ b/src/MW5.Api/Interfaces/IGeometryEditor.cs
@@ -21,6 +21,7 @@ public interface IGeometryEditor: IComWrapper
         int ShapeIndex { get; }
         GeometryType GeometryType { get; set; }
         LayerSelectionMode SnapBehavior { get; set; }
+        SnapMode SnapMode { get; set; }
         double SnapTolerance { get; set; }
         IGeometry ValidatedShape { get; }
         EditorValidation ValidationMode { get; set; }
diff --git a/src/MW5.Plugins/Services/ILayerEditingService.cs b/src/MW5.Plugins/Services/ILayerEditingService.cs
index f737574e..4741fb79 100644
--- a/src/MW5.Plugins/Services/ILayerEditingService.cs
+++ b/src/MW5.Plugins/Services/ILayerEditingService.cs
@@ -5,5 +5,9 @@ public interface ILayerEditingService
         void ToggleVectorLayerEditing();
         bool SaveLayerChanges(int layerHandle);
         void CreateLayer();
+        void ToggleSnapToActiveLayer();
+        void ToggleSnapToAllLayers();
+        void ToggleSnapToSegments();
+        void ToggleSnapToVertices();
     }
 }
diff --git a/src/MW5/Helpers/MapInitializer.cs b/src/MW5/Helpers/MapInitializer.cs
index 27a93e7f..5a35cb4d 100644
--- a/src/MW5/Helpers/MapInitializer.cs
+++ b/src/MW5/Helpers/MapInitializer.cs
@@ -92,6 +92,7 @@ public static void Initialize(this IMap map)
             map.Identifier.HotTracking = true;
             map.GeometryEditor.HighlightVertices = LayerSelectionMode.NoLayer;
             map.GeometryEditor.SnapBehavior = LayerSelectionMode.NoLayer;
+            map.GeometryEditor.SnapMode = SnapMode.VerticesAndLines;
             map.Identifier.HotTracking = false;
             map.ResizeBehavior = ResizeBehavior.KeepScale;
             map.Measuring.UndoButton = UndoShortcut.CtrlZ;
diff --git a/src/Plugins/MW5.ShapeEditor/Context/ContextMenuPresenter.cs b/src/Plugins/MW5.ShapeEditor/Context/ContextMenuPresenter.cs
index fa6858e2..f4a59cbe 100644
--- a/src/Plugins/MW5.ShapeEditor/Context/ContextMenuPresenter.cs
+++ b/src/Plugins/MW5.ShapeEditor/Context/ContextMenuPresenter.cs
@@ -4,6 +4,7 @@
 using MW5.Plugins.Interfaces;
 using MW5.Plugins.Mvp;
 using MW5.Plugins.Services;
+using MW5.Plugins.ShapeEditor.Menu;
 
 namespace MW5.Plugins.ShapeEditor.Context
 {
@@ -12,8 +13,9 @@ public class ContextMenuPresenter : CommandDispatcher<ContextMenuView, EditorCom
         private readonly IAppContext _context;
         private readonly ILayerService _layerService;
         private readonly IGeoprocessingService _geoService;
+        private readonly ShapeEditor _plugin;
 
-        public ContextMenuPresenter(IAppContext context, ILayerService layerService, 
+        public ContextMenuPresenter(IAppContext context, ShapeEditor plugin, ILayerService layerService, 
                         IGeoprocessingService geoService, ContextMenuView view)
             :base(view)
         {
@@ -23,6 +25,7 @@ public ContextMenuPresenter(IAppContext context, ILayerService layerService,
             _context = context;
             _layerService = layerService;
             _geoService = geoService;
+            _plugin = plugin;
         }
 
         public ContextMenuStrip DigitizingMenu
@@ -74,28 +77,50 @@ public bool HandleSnappingAndHighlighting(EditorCommand command)
         {
             var editor = _context.Map.GeometryEditor;
 
+            var handled = false;
             switch (command)
             {
+                case EditorCommand.SnapToVertices:
+                    editor.SnapMode = SnapMode.Vertices;
+                    handled = true;
+                    break;
+                case EditorCommand.SnapToLinesAndVertices:
+                    editor.SnapMode = SnapMode.VerticesAndLines;
+                    handled = true;
+                    break;
+                case EditorCommand.SnapToLines:
+                    editor.SnapMode = SnapMode.Lines;
+                    handled = true;
+                    break;
                 case EditorCommand.SnappingNone:
                     editor.SnapBehavior = LayerSelectionMode.NoLayer;
+                    handled = true;
                     break;
                 case EditorCommand.SnappingCurrent:
                     editor.SnapBehavior = LayerSelectionMode.ActiveLayer;
+                    handled = true;
                     break;
                 case EditorCommand.SnappingAll:
                     editor.SnapBehavior = LayerSelectionMode.AllLayers;
+                    handled = true;
                     break;
                 case EditorCommand.HighlightNone:
                     editor.HighlightVertices = LayerSelectionMode.NoLayer;
+                    handled = true;
                     break;
                 case EditorCommand.HighlightCurrent:
                     editor.HighlightVertices = LayerSelectionMode.ActiveLayer;
+                    handled = true;
                     break;
                 case EditorCommand.HighlightAll:
                     editor.HighlightVertices = LayerSelectionMode.AllLayers;
+                    handled = true;
                     break;
             }
-            return false;
+
+            _plugin._menuUpdater.UpdateSnapStates();
+
+            return handled;
         }
 
         public bool HandleVertexEditor(EditorCommand command)
diff --git a/src/Plugins/MW5.ShapeEditor/Context/ContextMenuView.Designer.cs b/src/Plugins/MW5.ShapeEditor/Context/ContextMenuView.Designer.cs
index 2c09153a..b97c4579 100644
--- a/src/Plugins/MW5.ShapeEditor/Context/ContextMenuView.Designer.cs
+++ b/src/Plugins/MW5.ShapeEditor/Context/ContextMenuView.Designer.cs
@@ -30,7 +30,6 @@ private void InitializeComponent()
         {
             this.components = new System.ComponentModel.Container();
             this.contextDigitizing = new System.Windows.Forms.ContextMenuStrip(this.components);
-            this.ctxUndoPoint = new System.Windows.Forms.ToolStripMenuItem();
             this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
             this.ctxSnapNone = new System.Windows.Forms.ToolStripMenuItem();
             this.ctxSnapCurrent = new System.Windows.Forms.ToolStripMenuItem();
@@ -46,18 +45,9 @@ private void InitializeComponent()
             this.ctxSelectByRectangle = new System.Windows.Forms.ToolStripMenuItem();
             this.ctxClearSelection = new System.Windows.Forms.ToolStripMenuItem();
             this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
-            this.ctxSplitShapes = new System.Windows.Forms.ToolStripMenuItem();
-            this.ctxMergeShapes = new System.Windows.Forms.ToolStripMenuItem();
-            this.ctxRotateShapes = new System.Windows.Forms.ToolStripMenuItem();
-            this.ctxMoveShapes = new System.Windows.Forms.ToolStripMenuItem();
             this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator();
-            this.ctxCopy = new System.Windows.Forms.ToolStripMenuItem();
-            this.ctxCut = new System.Windows.Forms.ToolStripMenuItem();
-            this.ctxPaste = new System.Windows.Forms.ToolStripMenuItem();
             this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator();
-            this.ctxRemoveShapes = new System.Windows.Forms.ToolStripMenuItem();
             this.contextVertex = new System.Windows.Forms.ContextMenuStrip(this.components);
-            this.ctxUndo = new System.Windows.Forms.ToolStripMenuItem();
             this.digitizerSeparator = new System.Windows.Forms.ToolStripSeparator();
             this.ctxVertexEditor = new System.Windows.Forms.ToolStripMenuItem();
             this.ctxPartEditor = new System.Windows.Forms.ToolStripMenuItem();
@@ -66,9 +56,6 @@ private void InitializeComponent()
             this.ctxRemovePart = new System.Windows.Forms.ToolStripMenuItem();
             this.editorSeparator2 = new System.Windows.Forms.ToolStripSeparator();
             this.ctxSnapping = new System.Windows.Forms.ToolStripMenuItem();
-            this.ctxSnappingNone = new System.Windows.Forms.ToolStripMenuItem();
-            this.ctxSnappingCurrent = new System.Windows.Forms.ToolStripMenuItem();
-            this.ctxSnappingAll = new System.Windows.Forms.ToolStripMenuItem();
             this.ctxHighlighting = new System.Windows.Forms.ToolStripMenuItem();
             this.mnuHighlightNone = new System.Windows.Forms.ToolStripMenuItem();
             this.mnuHighlightCurrent = new System.Windows.Forms.ToolStripMenuItem();
@@ -76,6 +63,24 @@ private void InitializeComponent()
             this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator();
             this.ctxSaveShape = new System.Windows.Forms.ToolStripMenuItem();
             this.ctxClearEditor = new System.Windows.Forms.ToolStripMenuItem();
+            this.tsmSnapMode = new System.Windows.Forms.ToolStripMenuItem();
+            this.ctxSnapToLinesAndVertices = new System.Windows.Forms.ToolStripMenuItem();
+            this.snapSourcesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.ctxSnappingNone = new System.Windows.Forms.ToolStripMenuItem();
+            this.ctxSnappingCurrent = new System.Windows.Forms.ToolStripMenuItem();
+            this.ctxSnappingAll = new System.Windows.Forms.ToolStripMenuItem();
+            this.ctxUndoPoint = new System.Windows.Forms.ToolStripMenuItem();
+            this.ctxSplitShapes = new System.Windows.Forms.ToolStripMenuItem();
+            this.ctxMergeShapes = new System.Windows.Forms.ToolStripMenuItem();
+            this.ctxRotateShapes = new System.Windows.Forms.ToolStripMenuItem();
+            this.ctxMoveShapes = new System.Windows.Forms.ToolStripMenuItem();
+            this.ctxCopy = new System.Windows.Forms.ToolStripMenuItem();
+            this.ctxCut = new System.Windows.Forms.ToolStripMenuItem();
+            this.ctxPaste = new System.Windows.Forms.ToolStripMenuItem();
+            this.ctxRemoveShapes = new System.Windows.Forms.ToolStripMenuItem();
+            this.ctxUndo = new System.Windows.Forms.ToolStripMenuItem();
+            this.ctxSnapToVertices = new System.Windows.Forms.ToolStripMenuItem();
+            this.ctxSnapToLines = new System.Windows.Forms.ToolStripMenuItem();
             this.contextDigitizing.SuspendLayout();
             this.contextSelection.SuspendLayout();
             this.contextVertex.SuspendLayout();
@@ -99,14 +104,6 @@ private void InitializeComponent()
             this.contextDigitizing.Name = "contextMenuStrip1";
             this.contextDigitizing.Size = new System.Drawing.Size(176, 220);
             // 
-            // ctxUndoPoint
-            // 
-            this.ctxUndoPoint.Image = global::MW5.Plugins.ShapeEditor.Properties.Resources.icon_edit_undo;
-            this.ctxUndoPoint.Name = "ctxUndoPoint";
-            this.ctxUndoPoint.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Z)));
-            this.ctxUndoPoint.Size = new System.Drawing.Size(175, 22);
-            this.ctxUndoPoint.Text = "Undo Point";
-            // 
             // toolStripSeparator2
             // 
             this.toolStripSeparator2.Name = "toolStripSeparator2";
@@ -209,72 +206,16 @@ private void InitializeComponent()
             this.toolStripSeparator4.Name = "toolStripSeparator4";
             this.toolStripSeparator4.Size = new System.Drawing.Size(177, 6);
             // 
-            // ctxSplitShapes
-            // 
-            this.ctxSplitShapes.Image = global::MW5.Plugins.ShapeEditor.Properties.Resources.icon_geometry_split;
-            this.ctxSplitShapes.Name = "ctxSplitShapes";
-            this.ctxSplitShapes.Size = new System.Drawing.Size(180, 26);
-            this.ctxSplitShapes.Text = "Explode";
-            // 
-            // ctxMergeShapes
-            // 
-            this.ctxMergeShapes.Image = global::MW5.Plugins.ShapeEditor.Properties.Resources.icon_geometry_merge;
-            this.ctxMergeShapes.Name = "ctxMergeShapes";
-            this.ctxMergeShapes.Size = new System.Drawing.Size(180, 26);
-            this.ctxMergeShapes.Text = "Merge";
-            // 
-            // ctxRotateShapes
-            // 
-            this.ctxRotateShapes.Image = global::MW5.Plugins.ShapeEditor.Properties.Resources.icon_geometry_rotate;
-            this.ctxRotateShapes.Name = "ctxRotateShapes";
-            this.ctxRotateShapes.Size = new System.Drawing.Size(180, 26);
-            this.ctxRotateShapes.Text = "Rotate";
-            // 
-            // ctxMoveShapes
-            // 
-            this.ctxMoveShapes.Image = global::MW5.Plugins.ShapeEditor.Properties.Resources.icon_geometry_move;
-            this.ctxMoveShapes.Name = "ctxMoveShapes";
-            this.ctxMoveShapes.Size = new System.Drawing.Size(180, 26);
-            this.ctxMoveShapes.Text = "Move";
-            // 
             // toolStripSeparator5
             // 
             this.toolStripSeparator5.Name = "toolStripSeparator5";
             this.toolStripSeparator5.Size = new System.Drawing.Size(177, 6);
             // 
-            // ctxCopy
-            // 
-            this.ctxCopy.Image = global::MW5.Plugins.ShapeEditor.Properties.Resources.icon_edit_copy;
-            this.ctxCopy.Name = "ctxCopy";
-            this.ctxCopy.Size = new System.Drawing.Size(180, 26);
-            this.ctxCopy.Text = "Copy";
-            // 
-            // ctxCut
-            // 
-            this.ctxCut.Image = global::MW5.Plugins.ShapeEditor.Properties.Resources.icon_edit_cut;
-            this.ctxCut.Name = "ctxCut";
-            this.ctxCut.Size = new System.Drawing.Size(180, 26);
-            this.ctxCut.Text = "Cut";
-            // 
-            // ctxPaste
-            // 
-            this.ctxPaste.Image = global::MW5.Plugins.ShapeEditor.Properties.Resources.icon_edit_paste;
-            this.ctxPaste.Name = "ctxPaste";
-            this.ctxPaste.Size = new System.Drawing.Size(180, 26);
-            this.ctxPaste.Text = "Paste";
-            // 
             // toolStripSeparator6
             // 
             this.toolStripSeparator6.Name = "toolStripSeparator6";
             this.toolStripSeparator6.Size = new System.Drawing.Size(177, 6);
             // 
-            // ctxRemoveShapes
-            // 
-            this.ctxRemoveShapes.Image = global::MW5.Plugins.ShapeEditor.Properties.Resources.img_delete_selected;
-            this.ctxRemoveShapes.Name = "ctxRemoveShapes";
-            this.ctxRemoveShapes.Size = new System.Drawing.Size(180, 26);
-            this.ctxRemoveShapes.Text = "Delete";
-            // 
             // contextVertex
             // 
             this.contextVertex.ImageScalingSize = new System.Drawing.Size(20, 20);
@@ -293,15 +234,7 @@ private void InitializeComponent()
             this.ctxSaveShape,
             this.ctxClearEditor});
             this.contextVertex.Name = "contextMenuStrip1";
-            this.contextVertex.Size = new System.Drawing.Size(202, 284);
-            // 
-            // ctxUndo
-            // 
-            this.ctxUndo.Image = global::MW5.Plugins.ShapeEditor.Properties.Resources.icon_edit_undo;
-            this.ctxUndo.Name = "ctxUndo";
-            this.ctxUndo.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Z)));
-            this.ctxUndo.Size = new System.Drawing.Size(201, 26);
-            this.ctxUndo.Text = "Undo Point";
+            this.contextVertex.Size = new System.Drawing.Size(202, 262);
             // 
             // digitizerSeparator
             // 
@@ -345,31 +278,12 @@ private void InitializeComponent()
             // ctxSnapping
             // 
             this.ctxSnapping.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.ctxSnappingNone,
-            this.ctxSnappingCurrent,
-            this.ctxSnappingAll});
+            this.tsmSnapMode,
+            this.snapSourcesToolStripMenuItem});
             this.ctxSnapping.Name = "ctxSnapping";
             this.ctxSnapping.Size = new System.Drawing.Size(201, 26);
             this.ctxSnapping.Text = "Snapping";
             // 
-            // ctxSnappingNone
-            // 
-            this.ctxSnappingNone.Name = "ctxSnappingNone";
-            this.ctxSnappingNone.Size = new System.Drawing.Size(152, 22);
-            this.ctxSnappingNone.Text = "No Layers";
-            // 
-            // ctxSnappingCurrent
-            // 
-            this.ctxSnappingCurrent.Name = "ctxSnappingCurrent";
-            this.ctxSnappingCurrent.Size = new System.Drawing.Size(152, 22);
-            this.ctxSnappingCurrent.Text = "Current Layer";
-            // 
-            // ctxSnappingAll
-            // 
-            this.ctxSnappingAll.Name = "ctxSnappingAll";
-            this.ctxSnappingAll.Size = new System.Drawing.Size(152, 22);
-            this.ctxSnappingAll.Text = "All Layers";
-            // 
             // ctxHighlighting
             // 
             this.ctxHighlighting.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
@@ -415,6 +329,135 @@ private void InitializeComponent()
             this.ctxClearEditor.Size = new System.Drawing.Size(201, 26);
             this.ctxClearEditor.Text = "Discard Shape Changes";
             // 
+            // tsmSnapMode
+            // 
+            this.tsmSnapMode.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.ctxSnapToVertices,
+            this.ctxSnapToLines,
+            this.ctxSnapToLinesAndVertices});
+            this.tsmSnapMode.Name = "tsmSnapMode";
+            this.tsmSnapMode.Size = new System.Drawing.Size(180, 22);
+            this.tsmSnapMode.Text = "Snap Targets";
+            // 
+            // ctxSnapToLinesAndVertices
+            // 
+            this.ctxSnapToLinesAndVertices.Name = "ctxSnapToLinesAndVertices";
+            this.ctxSnapToLinesAndVertices.Size = new System.Drawing.Size(180, 22);
+            this.ctxSnapToLinesAndVertices.Text = "Lines and Vertices";
+            // 
+            // snapSourcesToolStripMenuItem
+            // 
+            this.snapSourcesToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.ctxSnappingAll,
+            this.ctxSnappingCurrent,
+            this.ctxSnappingNone});
+            this.snapSourcesToolStripMenuItem.Name = "snapSourcesToolStripMenuItem";
+            this.snapSourcesToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.snapSourcesToolStripMenuItem.Text = "Snap Sources";
+            // 
+            // ctxSnappingNone
+            // 
+            this.ctxSnappingNone.Name = "ctxSnappingNone";
+            this.ctxSnappingNone.Size = new System.Drawing.Size(145, 22);
+            this.ctxSnappingNone.Text = "No Layers";
+            // 
+            // ctxSnappingCurrent
+            // 
+            this.ctxSnappingCurrent.Name = "ctxSnappingCurrent";
+            this.ctxSnappingCurrent.Size = new System.Drawing.Size(145, 22);
+            this.ctxSnappingCurrent.Text = "Current Layer";
+            // 
+            // ctxSnappingAll
+            // 
+            this.ctxSnappingAll.Name = "ctxSnappingAll";
+            this.ctxSnappingAll.Size = new System.Drawing.Size(145, 22);
+            this.ctxSnappingAll.Text = "All Layers";
+            // 
+            // ctxUndoPoint
+            // 
+            this.ctxUndoPoint.Image = global::MW5.Plugins.ShapeEditor.Properties.Resources.icon_edit_undo;
+            this.ctxUndoPoint.Name = "ctxUndoPoint";
+            this.ctxUndoPoint.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Z)));
+            this.ctxUndoPoint.Size = new System.Drawing.Size(175, 22);
+            this.ctxUndoPoint.Text = "Undo Point";
+            // 
+            // ctxSplitShapes
+            // 
+            this.ctxSplitShapes.Image = global::MW5.Plugins.ShapeEditor.Properties.Resources.icon_geometry_split;
+            this.ctxSplitShapes.Name = "ctxSplitShapes";
+            this.ctxSplitShapes.Size = new System.Drawing.Size(180, 26);
+            this.ctxSplitShapes.Text = "Explode";
+            // 
+            // ctxMergeShapes
+            // 
+            this.ctxMergeShapes.Image = global::MW5.Plugins.ShapeEditor.Properties.Resources.icon_geometry_merge;
+            this.ctxMergeShapes.Name = "ctxMergeShapes";
+            this.ctxMergeShapes.Size = new System.Drawing.Size(180, 26);
+            this.ctxMergeShapes.Text = "Merge";
+            // 
+            // ctxRotateShapes
+            // 
+            this.ctxRotateShapes.Image = global::MW5.Plugins.ShapeEditor.Properties.Resources.icon_geometry_rotate;
+            this.ctxRotateShapes.Name = "ctxRotateShapes";
+            this.ctxRotateShapes.Size = new System.Drawing.Size(180, 26);
+            this.ctxRotateShapes.Text = "Rotate";
+            // 
+            // ctxMoveShapes
+            // 
+            this.ctxMoveShapes.Image = global::MW5.Plugins.ShapeEditor.Properties.Resources.icon_geometry_move;
+            this.ctxMoveShapes.Name = "ctxMoveShapes";
+            this.ctxMoveShapes.Size = new System.Drawing.Size(180, 26);
+            this.ctxMoveShapes.Text = "Move";
+            // 
+            // ctxCopy
+            // 
+            this.ctxCopy.Image = global::MW5.Plugins.ShapeEditor.Properties.Resources.icon_edit_copy;
+            this.ctxCopy.Name = "ctxCopy";
+            this.ctxCopy.Size = new System.Drawing.Size(180, 26);
+            this.ctxCopy.Text = "Copy";
+            // 
+            // ctxCut
+            // 
+            this.ctxCut.Image = global::MW5.Plugins.ShapeEditor.Properties.Resources.icon_edit_cut;
+            this.ctxCut.Name = "ctxCut";
+            this.ctxCut.Size = new System.Drawing.Size(180, 26);
+            this.ctxCut.Text = "Cut";
+            // 
+            // ctxPaste
+            // 
+            this.ctxPaste.Image = global::MW5.Plugins.ShapeEditor.Properties.Resources.icon_edit_paste;
+            this.ctxPaste.Name = "ctxPaste";
+            this.ctxPaste.Size = new System.Drawing.Size(180, 26);
+            this.ctxPaste.Text = "Paste";
+            // 
+            // ctxRemoveShapes
+            // 
+            this.ctxRemoveShapes.Image = global::MW5.Plugins.ShapeEditor.Properties.Resources.img_delete_selected;
+            this.ctxRemoveShapes.Name = "ctxRemoveShapes";
+            this.ctxRemoveShapes.Size = new System.Drawing.Size(180, 26);
+            this.ctxRemoveShapes.Text = "Delete";
+            // 
+            // ctxUndo
+            // 
+            this.ctxUndo.Image = global::MW5.Plugins.ShapeEditor.Properties.Resources.icon_edit_undo;
+            this.ctxUndo.Name = "ctxUndo";
+            this.ctxUndo.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Z)));
+            this.ctxUndo.Size = new System.Drawing.Size(201, 26);
+            this.ctxUndo.Text = "Undo Point";
+            // 
+            // ctxSnapToVertices
+            // 
+            this.ctxSnapToVertices.Name = "ctxSnapToVertices";
+            this.ctxSnapToVertices.Size = new System.Drawing.Size(180, 22);
+            this.ctxSnapToVertices.Text = "Vertices";
+            // 
+            // ctxSnapToLines
+            // 
+            this.ctxSnapToLines.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
+            this.ctxSnapToLines.Name = "ctxSnapToLines";
+            this.ctxSnapToLines.Size = new System.Drawing.Size(180, 22);
+            this.ctxSnapToLines.Text = "Segments";
+            // 
             // ContextMenuView
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -466,9 +509,6 @@ private void InitializeComponent()
         private System.Windows.Forms.ToolStripMenuItem ctxRemovePart;
         private System.Windows.Forms.ToolStripSeparator editorSeparator2;
         private System.Windows.Forms.ToolStripMenuItem ctxSnapping;
-        private System.Windows.Forms.ToolStripMenuItem ctxSnappingNone;
-        private System.Windows.Forms.ToolStripMenuItem ctxSnappingCurrent;
-        private System.Windows.Forms.ToolStripMenuItem ctxSnappingAll;
         private System.Windows.Forms.ToolStripMenuItem ctxHighlighting;
         private System.Windows.Forms.ToolStripMenuItem mnuHighlightNone;
         private System.Windows.Forms.ToolStripMenuItem mnuHighlightCurrent;
@@ -476,5 +516,13 @@ private void InitializeComponent()
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator7;
         private System.Windows.Forms.ToolStripMenuItem ctxSaveShape;
         private System.Windows.Forms.ToolStripMenuItem ctxClearEditor;
+        private System.Windows.Forms.ToolStripMenuItem tsmSnapMode;
+        private System.Windows.Forms.ToolStripMenuItem ctxSnapToVertices;
+        private System.Windows.Forms.ToolStripMenuItem ctxSnapToLines;
+        private System.Windows.Forms.ToolStripMenuItem ctxSnapToLinesAndVertices;
+        private System.Windows.Forms.ToolStripMenuItem snapSourcesToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem ctxSnappingAll;
+        private System.Windows.Forms.ToolStripMenuItem ctxSnappingCurrent;
+        private System.Windows.Forms.ToolStripMenuItem ctxSnappingNone;
     }
 }
diff --git a/src/Plugins/MW5.ShapeEditor/Context/ContextMenuView.cs b/src/Plugins/MW5.ShapeEditor/Context/ContextMenuView.cs
index ddd53a95..1db5adea 100644
--- a/src/Plugins/MW5.ShapeEditor/Context/ContextMenuView.cs
+++ b/src/Plugins/MW5.ShapeEditor/Context/ContextMenuView.cs
@@ -4,6 +4,7 @@
 using System.Linq;
 using System.Windows.Forms;
 using MW5.Api.Enums;
+using MW5.Api.Interfaces;
 using MW5.Plugins.Interfaces;
 using MW5.Plugins.Mvp;
 using MW5.Plugins.Services;
@@ -80,16 +81,9 @@ private void VertexMenuOpening(object sender, CancelEventArgs e)
             ctxVertexEditor.Checked = editor.EditorBehavior == EditorBehavior.VertexEditor;
             ctxPartEditor.Checked = editor.EditorBehavior == EditorBehavior.PartEditor;
 
-            ctxSnappingAll.Checked = editor.SnapBehavior == LayerSelectionMode.AllLayers;
-            ctxSnappingNone.Checked = editor.SnapBehavior == LayerSelectionMode.NoLayer;
-            ctxSnappingCurrent.Checked = editor.SnapBehavior == LayerSelectionMode.ActiveLayer;
+            SetupSnapping(editor);
 
-            mnuHighlightCurrent.Checked = editor.HighlightVertices == LayerSelectionMode.ActiveLayer;
-            mnuHighlightAll.Checked = editor.HighlightVertices == LayerSelectionMode.AllLayers;
-            mnuHighlightNone.Checked = editor.HighlightVertices == LayerSelectionMode.NoLayer;
-
-            ctxHighlighting.Enabled = true;
-            ctxSnapping.Enabled = true;
+            SetupHighlighting(editor);
 
             bool editing = _context.Map.MapCursor == MapCursor.EditShape;
             ctxPartEditor.Visible = editing;
@@ -157,13 +151,31 @@ private void DigitizingMenuOpening(object sender, CancelEventArgs e)
             ctxFinishShape.Enabled = notEmpty;
             ctxUndoPoint.Enabled = notEmpty;
 
+            SetupSnapping(editor);
+
+            SetupHighlighting(editor);
+        }
+
+        private void SetupSnapping(IGeometryEditor editor)
+        {
             ctxSnapAll.Checked = editor.SnapBehavior == LayerSelectionMode.AllLayers;
             ctxSnapNone.Checked = editor.SnapBehavior == LayerSelectionMode.NoLayer;
             ctxSnapCurrent.Checked = editor.SnapBehavior == LayerSelectionMode.ActiveLayer;
 
-            ctxHighlightCurrent.Checked = editor.HighlightVertices == LayerSelectionMode.ActiveLayer;
-            ctxHighlightAll.Checked = editor.HighlightVertices == LayerSelectionMode.AllLayers;
-            ctxHighlightNone.Checked = editor.HighlightVertices == LayerSelectionMode.NoLayer;
+            ctxSnapToLines.Checked = editor.SnapMode == SnapMode.VerticesAndLines;
+            ctxSnapToVertices.Checked = editor.SnapMode == SnapMode.Vertices;
+            ctxSnapToLines.Checked = editor.SnapMode == SnapMode.Lines;
+
+            ctxSnapping.Enabled = true;
+        }
+
+        private void SetupHighlighting(IGeometryEditor editor)
+        {
+            mnuHighlightCurrent.Checked = editor.HighlightVertices == LayerSelectionMode.ActiveLayer;
+            mnuHighlightAll.Checked = editor.HighlightVertices == LayerSelectionMode.AllLayers;
+            mnuHighlightNone.Checked = editor.HighlightVertices == LayerSelectionMode.NoLayer;
+
+            ctxHighlighting.Enabled = true;
         }
 
         private void DisableAll(ContextMenuStrip menu)
diff --git a/src/Plugins/MW5.ShapeEditor/Context/ContextMenuView.resx b/src/Plugins/MW5.ShapeEditor/Context/ContextMenuView.resx
index c828aa24..f7f87c8b 100644
--- a/src/Plugins/MW5.ShapeEditor/Context/ContextMenuView.resx
+++ b/src/Plugins/MW5.ShapeEditor/Context/ContextMenuView.resx
@@ -124,6 +124,6 @@
     <value>173, 21</value>
   </metadata>
   <metadata name="contextVertex.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>328, 25</value>
+    <value>332, 24</value>
   </metadata>
 </root>
\ No newline at end of file
diff --git a/src/Plugins/MW5.ShapeEditor/Context/EditorCommand.cs b/src/Plugins/MW5.ShapeEditor/Context/EditorCommand.cs
index 200cf185..c6c546f2 100644
--- a/src/Plugins/MW5.ShapeEditor/Context/EditorCommand.cs
+++ b/src/Plugins/MW5.ShapeEditor/Context/EditorCommand.cs
@@ -38,5 +38,9 @@ public enum EditorCommand
         UndoPoint = 33,
         FinishShape = 34,
         CancelShape = 35,
+
+        SnapToVertices = 63,
+        SnapToLinesAndVertices = 64,
+        SnapToLines = 65
     }
 }
diff --git a/src/Plugins/MW5.ShapeEditor/MW5.ShapeEditor.csproj b/src/Plugins/MW5.ShapeEditor/MW5.ShapeEditor.csproj
index e346ae92..68cef8f7 100644
--- a/src/Plugins/MW5.ShapeEditor/MW5.ShapeEditor.csproj
+++ b/src/Plugins/MW5.ShapeEditor/MW5.ShapeEditor.csproj
@@ -235,6 +235,12 @@
   <ItemGroup>
     <None Include="Resources\img_shape_editor32.png" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\img_snap_active_layer.png" />
+    <None Include="Resources\img_snap_all_layers.png" />
+    <None Include="Resources\img_snap_to_segments.png" />
+    <None Include="Resources\img_snap_to_vertices.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/src/Plugins/MW5.ShapeEditor/Menu/MenuCommands.cs b/src/Plugins/MW5.ShapeEditor/Menu/MenuCommands.cs
index 399abad7..a859130a 100644
--- a/src/Plugins/MW5.ShapeEditor/Menu/MenuCommands.cs
+++ b/src/Plugins/MW5.ShapeEditor/Menu/MenuCommands.cs
@@ -55,6 +55,12 @@ public override IEnumerable<MenuCommand> GetCommands()
                 new MenuCommand("Split by Polyline", MenuKeys.SplitByPolyline, Resources.icon_geometry_split_by_polyline),
 
                 new MenuCommand("Delete Selected", MenuKeys.DeleteSelected, Resources.img_delete_selected),
+
+                new MenuCommand("Snap to Active Layer", MenuKeys.SnapToActiveLayer, Resources.img_snap_active_layer),
+                new MenuCommand("Snap to All Layers", MenuKeys.SnapToAlLayers, Resources.img_snap_all_layers),
+
+                new MenuCommand("Snap to Vertices", MenuKeys.SnapToVertices, Resources.img_snap_to_vertices),
+                new MenuCommand("Snap to Segments", MenuKeys.SnapToSegments, Resources.img_snap_to_segments),
             };
         }
     }
diff --git a/src/Plugins/MW5.ShapeEditor/Menu/MenuGenerator.cs b/src/Plugins/MW5.ShapeEditor/Menu/MenuGenerator.cs
index 1ee0c44b..17f79157 100644
--- a/src/Plugins/MW5.ShapeEditor/Menu/MenuGenerator.cs
+++ b/src/Plugins/MW5.ShapeEditor/Menu/MenuGenerator.cs
@@ -17,6 +17,8 @@ internal class MenuGenerator
         
         private readonly MenuCommands _commands;
 
+        private IToolbar _toolbar;
+
         public MenuGenerator(IAppContext context, ShapeEditor plugin)
         {
             _commands = new MenuCommands(plugin.Identity);
@@ -32,18 +34,21 @@ private void InitToolbar(IAppContext context, PluginIdentity identity)
             items.AddButton(_commands[MenuKeys.CreateLayer]).BeginGroup = true;
             context.Toolbars.FileToolbar.Update();
 
-            var bar = context.Toolbars.Add(ShapeEditorToolbar, identity);
-            bar.DockState = ToolbarDockState.Top;
+            _toolbar = context.Toolbars.Add(ShapeEditorToolbar, identity);
+            _toolbar.DockState = ToolbarDockState.Top;
 
-            items = bar.Items;
+            items = _toolbar.Items;
 
             items.AddButton(_commands[MenuKeys.LayerEdit]);
+
             items.AddButton(_commands[MenuKeys.GeometryCreate], true);
             items.AddButton(_commands[MenuKeys.VertexEditor]);
+
             items.AddButton(_commands[MenuKeys.SplitShapes], true);
             items.AddButton(_commands[MenuKeys.MergeShapes]);
             items.AddButton(_commands[MenuKeys.MoveShapes]);
             items.AddButton(_commands[MenuKeys.RotateShapes]);
+
             items.AddButton(_commands[MenuKeys.Copy], true);
             items.AddButton(_commands[MenuKeys.Paste]);
             items.AddButton(_commands[MenuKeys.Cut]);
@@ -63,7 +68,12 @@ private void InitToolbar(IAppContext context, PluginIdentity identity)
 
             items.AddButton(_commands[MenuKeys.Redo]);
 
-            bar.Update();
+            items.AddButton(_commands[MenuKeys.SnapToActiveLayer], true);
+            items.AddButton(_commands[MenuKeys.SnapToAlLayers]);
+            items.AddButton(_commands[MenuKeys.SnapToVertices], true);
+            items.AddButton(_commands[MenuKeys.SnapToSegments]);
+
+            _toolbar.Update();
         }
 
         private void InitMenu(IAppContext context, PluginIdentity identity)
diff --git a/src/Plugins/MW5.ShapeEditor/Menu/MenuKeys.cs b/src/Plugins/MW5.ShapeEditor/Menu/MenuKeys.cs
index 25be53be..ec2bee52 100644
--- a/src/Plugins/MW5.ShapeEditor/Menu/MenuKeys.cs
+++ b/src/Plugins/MW5.ShapeEditor/Menu/MenuKeys.cs
@@ -26,5 +26,10 @@ internal static class MenuKeys
         public const string SplitByPolyline = "se_SplitByPolyline";
         public const string PolygonOverlayDropDown = "se_PolygonOverlayDropDown";
         public const string DeleteSelected = "se_DeleteSelected";
+
+        public const string SnapToActiveLayer = "se_SnapToActiveLayer";
+        public const string SnapToAlLayers = "se_SnapToAllLayers";
+        public const string SnapToVertices = "se_SnapToVertices";
+        public const string SnapToSegments = "se_SnapToSegments";
     }
 }
diff --git a/src/Plugins/MW5.ShapeEditor/Menu/MenuListener.cs b/src/Plugins/MW5.ShapeEditor/Menu/MenuListener.cs
index 698471bc..c02b9213 100644
--- a/src/Plugins/MW5.ShapeEditor/Menu/MenuListener.cs
+++ b/src/Plugins/MW5.ShapeEditor/Menu/MenuListener.cs
@@ -11,17 +11,15 @@ internal class MenuListener
         private readonly ILayerEditingService _layerService;
         private readonly IGeoprocessingService _geoprocessingService;
         private readonly IAppContext _context;
+        private readonly ShapeEditor _plugin;
 
         public MenuListener(IAppContext context, ShapeEditor plugin, ILayerEditingService layerService, 
                 IGeoprocessingService geoprocessingService)
         {
-            if (context == null) throw new ArgumentNullException("context");
-            if (layerService == null) throw new ArgumentNullException("layerService");
-            if (geoprocessingService == null) throw new ArgumentNullException("geoprocessingService");
-
-            _layerService = layerService;
-            _geoprocessingService = geoprocessingService;
-            _context = context;
+            _plugin = plugin ?? throw new ArgumentNullException("plugin");
+            _layerService = layerService ?? throw new ArgumentNullException("layerService");
+            _geoprocessingService = geoprocessingService ?? throw new ArgumentNullException("geoprocessingService");
+            _context = context ?? throw new ArgumentNullException("context");
 
             plugin.ItemClicked += Plugin_ItemClicked;
         }
@@ -40,27 +38,55 @@ private void Plugin_ItemClicked(object sender, MenuItemEventArgs e)
                 return;
             }
 
-            switch (e.ItemKey)
+            if (HandleSnapSetting(e.ItemKey))
+            {
+                _context.View.Update();
+                return;
+            }
+
+            if (HandleLayerKeys(e.ItemKey))
+            {
+                _context.View.Update();
+                return;
+            }
+
+            if (HandleUndoRedo(e.ItemKey))
+            {
+                _context.View.Update();
+                return;
+            }
+
+            _context.View.Update();
+        }
+
+        public bool HandleUndoRedo(string itemKey)
+        {
+            switch (itemKey)
             {
-                case MenuKeys.DeleteSelected:
-                    _geoprocessingService.RemoveSelectedShapes(true);
-                    break;
-                case MenuKeys.CreateLayer:
-                    _layerService.CreateLayer();
-                    break;
-                case MenuKeys.LayerEdit:
-                    _layerService.ToggleVectorLayerEditing();
-                    break;
                 case MenuKeys.Undo:
                     _context.Map.History.Undo();
                     _context.Map.Redraw(RedrawType.SkipDataLayers);
-                    break;
+                    return true;
                 case MenuKeys.Redo:
                     _context.Map.History.Redo();
                     _context.Map.Redraw(RedrawType.SkipDataLayers);
-                    break;
+                    return true;
             }
-            _context.View.Update();
+            return false;
+        }
+
+        public bool HandleLayerKeys(string itemKey)
+        {
+            switch (itemKey)
+            {
+                case MenuKeys.CreateLayer:
+                    _layerService.CreateLayer();
+                    return true;
+                case MenuKeys.LayerEdit:
+                    _layerService.ToggleVectorLayerEditing();
+                    return true;
+            }
+            return false;
         }
 
         public bool HandleMapCursorChange(string itemKey)
@@ -114,11 +140,32 @@ public bool HandleGroupOperation(string itemKey)
                 case MenuKeys.SplitShapes:
                     _geoprocessingService.ExplodeShapes();
                     return true;
+                case MenuKeys.DeleteSelected:
                 case MenuKeys.RemoveShapes:
                     _geoprocessingService.RemoveSelectedShapes(true);
                     return true;
             }
             return false;
         }
+
+        public bool HandleSnapSetting(string itemKey)
+        {
+            switch (itemKey)
+            {
+                case MenuKeys.SnapToActiveLayer:
+                    _layerService.ToggleSnapToActiveLayer();
+                    return true;
+                case MenuKeys.SnapToAlLayers:
+                    _layerService.ToggleSnapToAllLayers();
+                    return true;
+                case MenuKeys.SnapToSegments:
+                    _layerService.ToggleSnapToSegments();
+                    return true;
+                case MenuKeys.SnapToVertices:
+                    _layerService.ToggleSnapToVertices();
+                    return true;
+            }
+            return false;
+        }
     }
 }
diff --git a/src/Plugins/MW5.ShapeEditor/Menu/MenuUpdater.cs b/src/Plugins/MW5.ShapeEditor/Menu/MenuUpdater.cs
index e2a9cfdc..b762bddf 100644
--- a/src/Plugins/MW5.ShapeEditor/Menu/MenuUpdater.cs
+++ b/src/Plugins/MW5.ShapeEditor/Menu/MenuUpdater.cs
@@ -1,17 +1,11 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-using MW5.Api.Concrete;
 using MW5.Api.Enums;
 using MW5.Api.Interfaces;
 using MW5.Plugins.Concrete;
 using MW5.Plugins.Interfaces;
 using MW5.Plugins.Services;
 using MW5.Plugins.ShapeEditor.Properties;
-using MW5.Plugins.ShapeEditor.Services;
 using MW5.UI.Menu;
 
 namespace MW5.Plugins.ShapeEditor.Menu
@@ -67,7 +61,9 @@ private void OnMapCursorChanged(IMuteMap sender, EventArgs e)
             FindToolbarItem(MenuKeys.SplitByPolygon).Checked = map.MapCursor == MapCursor.SplitByPolygon;
             FindToolbarItem(MenuKeys.EraseByPolygon).Checked = map.MapCursor == MapCursor.EraseByPolygon;
             FindToolbarItem(MenuKeys.ClipByPolygon).Checked = map.MapCursor == MapCursor.ClipByPolygon;
-            
+
+            UpdateSnapStates();
+
             bool polygonCursor = map.MapCursor ==  MapCursor.ClipByPolygon || 
                                  map.MapCursor == MapCursor.SplitByPolygon || 
                                  map.MapCursor == MapCursor.EraseByPolygon;
@@ -120,6 +116,8 @@ private void OnViewUpdating(object sender, EventArgs e)
                FindToolbarItem(MenuKeys.SplitShapes).Enabled = selectedCount > 0;
                FindToolbarItem(MenuKeys.MoveShapes).Enabled = selectedCount > 0;
                FindToolbarItem(MenuKeys.RotateShapes).Enabled = selectedCount > 0;
+
+               UpdateSnapStates();
             }
 
             UpdateCopyPaste(true);
@@ -177,6 +175,29 @@ internal bool GetEnabled(string itemKey)
             return false;
         }
 
+        internal void UpdateSnapStates()
+        {
+            var map = _context.Map;
+            var editor = map.GeometryEditor;
+
+            FindToolbarItem(MenuKeys.SnapToActiveLayer).Checked = editor.SnapBehavior == LayerSelectionMode.ActiveLayer;
+            FindToolbarItem(MenuKeys.SnapToAlLayers).Checked = editor.SnapBehavior == LayerSelectionMode.AllLayers;
+            FindToolbarItem(MenuKeys.SnapToSegments).Checked = editor.SnapMode != SnapMode.Vertices;
+            FindToolbarItem(MenuKeys.SnapToVertices).Checked = editor.SnapMode != SnapMode.Lines;
+
+            bool snapEditing = (
+                map.MapCursor == MapCursor.MoveShapes ||
+                map.MapCursor == MapCursor.RotateShapes ||
+                map.MapCursor == MapCursor.AddShape ||
+                map.MapCursor == MapCursor.EditShape
+            );
+
+            FindToolbarItem(MenuKeys.SnapToActiveLayer).Enabled = snapEditing;
+            FindToolbarItem(MenuKeys.SnapToAlLayers).Enabled = snapEditing;
+            FindToolbarItem(MenuKeys.SnapToSegments).Enabled = snapEditing;
+            FindToolbarItem(MenuKeys.SnapToVertices).Enabled = snapEditing;
+        }
+
         private void MenuDropDownOpening(object sender, EventArgs e)
         {
             UpdateCopyPaste(false);
diff --git a/src/Plugins/MW5.ShapeEditor/Properties/Resources.Designer.cs b/src/Plugins/MW5.ShapeEditor/Properties/Resources.Designer.cs
index 6a57a16c..4ba95238 100644
--- a/src/Plugins/MW5.ShapeEditor/Properties/Resources.Designer.cs
+++ b/src/Plugins/MW5.ShapeEditor/Properties/Resources.Designer.cs
@@ -19,7 +19,7 @@ namespace MW5.Plugins.ShapeEditor.Properties {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {
@@ -249,5 +249,45 @@ internal static System.Drawing.Bitmap img_shape_editor32 {
                 return ((System.Drawing.Bitmap)(obj));
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap img_snap_active_layer {
+            get {
+                object obj = ResourceManager.GetObject("img_snap_active_layer", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap img_snap_all_layers {
+            get {
+                object obj = ResourceManager.GetObject("img_snap_all_layers", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap img_snap_to_segments {
+            get {
+                object obj = ResourceManager.GetObject("img_snap_to_segments", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap img_snap_to_vertices {
+            get {
+                object obj = ResourceManager.GetObject("img_snap_to_vertices", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
     }
 }
diff --git a/src/Plugins/MW5.ShapeEditor/Properties/Resources.resx b/src/Plugins/MW5.ShapeEditor/Properties/Resources.resx
index 991a9721..fa5d5524 100644
--- a/src/Plugins/MW5.ShapeEditor/Properties/Resources.resx
+++ b/src/Plugins/MW5.ShapeEditor/Properties/Resources.resx
@@ -118,61 +118,73 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="icon_edit_copy" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\icon_edit_copy.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="icon_geometry_erase_by_polygon" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\icon_geometry_erase_by_polygon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="icon_edit_cut" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\icon_edit_cut.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="icon_edit_undo" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\icon_edit_undo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="icon_edit_paste" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\icon_edit_paste.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="img_shape_editor32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\img_shape_editor32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="img_snap_to_vertices" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\img_snap_to_vertices.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="icon_layer_edit" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\icon_layer_edit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="icon_edit_redo" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\icon_edit_redo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="icon_edit_undo" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\icon_edit_undo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="icon_geometry_attributes" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\icon_geometry_attributes.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="icon_layer_save" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\icon_layer_save.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="icon_geometry_create" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\icon_geometry_create.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="icon_geometry_erase_by_polygon" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\icon_geometry_erase_by_polygon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="icon_edit_copy" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\icon_edit_copy.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="icon_geometry_merge" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\icon_geometry_merge.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="icon_geometry_move" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\icon_geometry_move.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="icon_geometry_rotate" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\icon_geometry_rotate.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="icon_vertex_editor" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\icon_vertex_editor.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="icon_edit_paste" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\icon_edit_paste.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="icon_geometry_split" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\icon_geometry_split.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="icon_geometry_split_by_polyline" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\icon_geometry_split_by_polyline.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="icon_geometry_attributes" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\icon_geometry_attributes.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="icon_layer_create" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\icon_layer_create.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="icon_layer_edit" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\icon_layer_edit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="icon_layer_save" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\icon_layer_save.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="icon_vertex_editor" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\icon_vertex_editor.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="icon_geometry_split_by_polyline" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\icon_geometry_split_by_polyline.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="img_delete_selected" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\img_delete_selected.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="img_shape_editor32" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\img_shape_editor32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="icon_edit_cut" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\icon_edit_cut.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="icon_geometry_move" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\icon_geometry_move.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="img_snap_to_segments" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\img_snap_to_segments.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="img_snap_active_layer" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\img_snap_active_layer.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="img_snap_all_layers" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\img_snap_all_layers.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/src/Plugins/MW5.ShapeEditor/Resources/img_snap_active_layer.png b/src/Plugins/MW5.ShapeEditor/Resources/img_snap_active_layer.png
new file mode 100644
index 0000000000000000000000000000000000000000..fd0ac5ebed49f09c0fd11a2a496e5c29bda0e294
GIT binary patch
literal 537
zcmV+!0_OdRP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00004b3#c}2nYxW
zd<bNS00009a7bBm000ie000ie0hKEb8vp<R8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10hUQbK~zYI?UXS~BS9F3pKn*xgJ9z|@dV4*+6p3T?urB98nN*Y
zn07OYWl%wu%u0?c`~^08tsn>4g)1zz6wxb=D{Srx8?`X|*|?I#7!%29;{yXbFFWtc
zJ2MQt@!AMLHm6!Io}Y;HD!@rUwzp!ox8h#;-qZJ-MUORZrQZiE6uhoN(zXi)4;xtp
z2n&rm+%-5q5ea?-BW|C21`LWDP86q$M_na8Lc?L&s<jA3V9(5$*;WgJI2f%gF8`_5
z+HFx|Ky2Tm`~rqhrcK`bY!0whyNfV~uxmUs|5O8~equcHSJAHk;>ddQ&*ixM5n)b{
zOA?lzGJg;NP^;BK;Ge2ag;AJK_0mqMUsS#UB$BL}y!rjCfR#@x7b;o?P|*!l6@bie
z#s|hxP6w_ADxH`^(;=s99&El#u9H*XgCJjS<mS*-_ZY}H;(Yc!f4|d!2MqxHN&gBZ
z08n(zQKtfAP`-C#-j>o%sXv=jtsk~($9iI(lFg|`QKV56Y4aWLl$Kl6OWHom|MMAt
b<K?&o>Z_Xp-KFF$00000NkvXXu0mjfG?3rX

literal 0
HcmV?d00001

diff --git a/src/Plugins/MW5.ShapeEditor/Resources/img_snap_all_layers.png b/src/Plugins/MW5.ShapeEditor/Resources/img_snap_all_layers.png
new file mode 100644
index 0000000000000000000000000000000000000000..7635ab65af1ce8a7e8f8e590293994d8b64c4e43
GIT binary patch
literal 1148
zcmV-?1cUpDP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00004b3#c}2nYxW
zd<bNS00009a7bBm000ie000ie0hKEb8vp<R8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H11NlirK~zYI?NWbClyw;YeBbwuyW|cII0Pb&OT0UNX@*F-)e0fW
zX*vA^V=ez-<@lpqfHp$&(yiROV<{UM6JpDWtEAatO+^lrT(gW8U@&CzLpgU{f!(k7
zy_ffW`bS*B5wQBR&-VS}`+T3z^Lakc^JSQWv>dt8VD#;l1dU$^s3%7IRb_K?mIKw?
zfWhc{AwS#qSbEwdK54c2|4s3T0^y+67Z>YAN>UJvQ}~65DORckgLC%2rTpuX8$D|Z
z#)i_5%*HsvI&Lme5Y#u@J5zo2Ef&NjP7@KaNCL!xZ7H5mPBpj?6C=Q6xqUu+<G_(8
z3np=@!G+|N!5|21o`bPIzOwFWU9BQ0!vIq2Tx=(Rvvc#(tmC#@V=-KNhY6ynB1Pu=
zBvGTk<JOtmJ50<UQ1bu~u{!{8UUF6tqXqy&e&)}$7usiL-|U~+qki+`4v+t0HhCu#
zu8a?weh4Ytp(q)vRT^bC$G~J63KY&U&p}Ei?PP?wV{a(()>prBXRIBu=@eZVfKO+0
zbP2lsI^(D*J$rOOAEPhYlfOs0|I~Z`Jit5$)(xRwt*h=CL!l_idyl*I%Au210Hc1d
z-)1khhmT%7YEtp48vvr2!ZuYESGg9N0szcgGGk!7UL3>L;t91FcxVd1&j8H&1bsOG
zsCo5q0MT8a7xtdm|GM3h7w$H%nK=yrk7UZPS@Oc&mb`GcdF{+MK!k593Q@lI>vQ82
zVw_eVFfy>W2=oOpI_PjY+(fh;fN$idtlyv6=q^fqIDpo3W^!~oo_C$;UlA)OYS!g=
z@nK^wMHCRiT;Zl&J)2Wj-T7Fhkzx%|h6~?aT{-L-Pqu*ASuny=JG$P{tO&gv8yiNF
zQ2;;;Kpf*`=(S-aCxsRs(cM8d+FV=G7@sutt=`}>PKi@{uXk)12)iFehTgzkyO@uF
zsA*2kn6O^xNyM>c+aEKM`bSAE#SdP$z1MLi_3pcl^==hUBM}|ULRRD&j^i$ap;`)R
z&t$FlV%u}$X#Fw+I&HYB@THCz5c>R_KhIuhpQ(8o0BULh)c$R!3kd*#v(tH=K$~y&
z+OC~z+*SYphQw)<A8rx=Xh3+jx~Tf{Kh>BwqQ8PbZv&v!j}PU%dE$c<_Yh;{hnv~~
zXaTe=R(w$h0N`{v+lXif13Rve(#05S129DrW$r84=UI%u;0_*iK<uDrGJd-l&{mMl
zmuaH~B&K-|ET#C88~{LGvB%5F+62Zc5M^07P;p6DT3RYEg}WqVJrU}!|EQOmTD~V+
zLGbo+xQmVm0K%dwc)Be^;CX^1sssPIfFP*$j!o!|06+?+mm}~$7R8@@iJ2wdchSTE
O0000<MNUMnLSTYmMGkWS

literal 0
HcmV?d00001

diff --git a/src/Plugins/MW5.ShapeEditor/Resources/img_snap_to_segments.png b/src/Plugins/MW5.ShapeEditor/Resources/img_snap_to_segments.png
new file mode 100644
index 0000000000000000000000000000000000000000..1bc6f4c60675ed06d63424200f48ea3f50951c3e
GIT binary patch
literal 588
zcmV-S0<-;zP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00004b3#c}2nYxW
zd<bNS00009a7bBm000ie000ie0hKEb8vp<R8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10m(^3K~zYI?UX@l6G0e;pKk-nS_4`I5o&*c7r~nsg%T9OgNN3f
z6#qaAvaGZqNJ?9@xY<-eLGU7iU@M+`X{0DdJb3WXOKZhTEoek#Q=5>P&r2&3({0ig
z1nGO5@11#{Vdk5GUHxlGV<DUl57?Bw<W!wU-dXSKb^%Uf!6xlxlnI-(;daBD0#Kd-
zHQ-`lws3UE0e;5+2s{81#+u>H0&<hNWKaxBK{0sI5&*!|%^2_#r7u65KOP52A543|
z381rOz~Gs|C6s%BsL_#)!pEPFA3?YV;E3b53|Mn+0zZIr!Ax+f*_4D$6o53sl-J`;
zw*~Nf{4a{$1`tO^|MaF@_wi&$N7S7i?K?bh*J8Q4@jhc@jL8FKRXv$6<}<$y*X>UC
z_wU_*eVF9(x5`>$v=10MJ@j2gZvm+24OJBYb7)_eSzM$(HwUY=mAH(*UUH+tSK%JJ
zYUhD2LC)8u{<ibU%LVuSaw@g(sU%CE-(;)RD_aHt1T(<^!X4n9qVt0EqCE98{)Nrf
z#vakSqH=T}_y8Oeq*ss?plMrf36RU?YAQOmK33I{xQlHY08pXw5TOLTj>^%Fe1yCD
aPxK2H*Q7Jo#MnOo0000<MNUMnLSTZz;{YuH

literal 0
HcmV?d00001

diff --git a/src/Plugins/MW5.ShapeEditor/Resources/img_snap_to_vertices.png b/src/Plugins/MW5.ShapeEditor/Resources/img_snap_to_vertices.png
new file mode 100644
index 0000000000000000000000000000000000000000..af055a8df752b9b00a14bbdc48e72b54b77a02ee
GIT binary patch
literal 235
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjEX7WqAsj$Z!;#Vf<Z~8yL>4nJ
z@ErkR#;MwT(m+AU64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq=1StJY5_^
zJUWvTBv_ewB`&h6T>byw{h9s#lN}4&L=Lq07QFoOm&beg`{hSsED{!8VQ{iLmgQKo
zOxbhVftqe#`8L)mZI)IGZWv^#cLf@788BY-?7H)$W2?>~))ShGJvKGSIDA%+VrAxM
Z*eRiS>gMNbH-L6Bc)I$ztaD0e0sx~uPK*Em

literal 0
HcmV?d00001

diff --git a/src/Plugins/MW5.ShapeEditor/Services/LayerEditingService.cs b/src/Plugins/MW5.ShapeEditor/Services/LayerEditingService.cs
index de066202..fdab233c 100644
--- a/src/Plugins/MW5.ShapeEditor/Services/LayerEditingService.cs
+++ b/src/Plugins/MW5.ShapeEditor/Services/LayerEditingService.cs
@@ -264,5 +264,38 @@ public void CreateLayer()
                 _layerService.AddDatasource(fs, model.LayerName);
             }
         }
+
+        public void ToggleSnapToActiveLayer()
+        {
+            if (_context.Map.GeometryEditor.SnapBehavior == LayerSelectionMode.ActiveLayer)
+                _context.Map.GeometryEditor.SnapBehavior = LayerSelectionMode.NoLayer;
+            else
+                _context.Map.GeometryEditor.SnapBehavior = LayerSelectionMode.ActiveLayer;
+        }
+
+        public void ToggleSnapToAllLayers()
+        {
+            if (_context.Map.GeometryEditor.SnapBehavior == LayerSelectionMode.AllLayers)
+                _context.Map.GeometryEditor.SnapBehavior = LayerSelectionMode.NoLayer;
+            else
+                _context.Map.GeometryEditor.SnapBehavior = LayerSelectionMode.AllLayers;
+        }
+
+        public void ToggleSnapToSegments()
+        {
+            if (_context.Map.GeometryEditor.SnapMode == SnapMode.Vertices)
+                _context.Map.GeometryEditor.SnapMode = SnapMode.VerticesAndLines;
+            else
+                _context.Map.GeometryEditor.SnapMode = SnapMode.Vertices;
+        }
+
+        public void ToggleSnapToVertices()
+        {
+            if (_context.Map.GeometryEditor.SnapMode == SnapMode.Lines)
+                _context.Map.GeometryEditor.SnapMode = SnapMode.VerticesAndLines;
+            else
+                _context.Map.GeometryEditor.SnapMode = SnapMode.Lines;
+
+        }
     }
 }
diff --git a/src/Plugins/MW5.ShapeEditor/ShapeEditor.cs b/src/Plugins/MW5.ShapeEditor/ShapeEditor.cs
index 31dd6fda..5a91a171 100644
--- a/src/Plugins/MW5.ShapeEditor/ShapeEditor.cs
+++ b/src/Plugins/MW5.ShapeEditor/ShapeEditor.cs
@@ -16,7 +16,7 @@ public class ShapeEditor: BasePlugin
         private MenuGenerator _menuGenerator;
         private MenuListener _menuListener;
         private ProjectListener _projectListener;
-        private MenuUpdater _menuUpdater;
+        internal MenuUpdater _menuUpdater;
 
         protected override void RegisterServices(IApplicationContainer container)
         {

From 9fb08ac94ecc1e268031238fa8204c55c0598c99 Mon Sep 17 00:00:00 2001
From: Mathijs Dumon <mathijs.Dumon@gmail.com>
Date: Wed, 7 Nov 2018 10:42:25 +0100
Subject: [PATCH 03/15] MW5Core-222 Adding BeforeShapeEditEvent broadcast when
 removing selected features in the ShapeEditor plugin

---
 install/MapWindow5.iss                               |  2 +-
 src/MW5.Api/Events/BeforeDeleteShapeEventArgs.cs     |  8 ++++++++
 src/MW5.Api/Events/BeforeShapeEditEventArgs.cs       |  7 +++++++
 .../MW5.ShapeEditor/Services/GeoprocessingService.cs | 12 ++++++++++--
 4 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/install/MapWindow5.iss b/install/MapWindow5.iss
index 3d8ccb94..62d0ddf6 100644
--- a/install/MapWindow5.iss
+++ b/install/MapWindow5.iss
@@ -105,7 +105,7 @@ Source: "{#ExeBinPath}\x86\*"; DestDir: "{app}\x86"; Flags: ignoreversion {#Syst
 ;; Config files:
 Source: "{#ExeBinPath}\MapWindow.exe.config"; DestDir: "{app}"; Flags: ignoreversion {#SystemFlag}; Components: MapWindow; Permissions: users-modify
 ;; Licenses
-Source: "D:\dev\MapwinGIS\GitHub\support\GDAL_SDK\licenses\*.rtf"; DestDir: "{app}\Licenses"; Flags: ignoreversion; Components: MapWindow
+Source: "{#ExeBinPath}\..\..\..\..\MapWinGIS\support\GDAL_SDK\licenses\*.rtf"; DestDir: "{app}\Licenses"; Flags: ignoreversion; Components: MapWindow
 Source: "{#ExeBinPath}\..\..\..\licenses\*"; DestDir: "{app}\Licenses"; Flags: ignoreversion {#SystemFlag}; Components: MapWindow
 
 ;; Sample data
diff --git a/src/MW5.Api/Events/BeforeDeleteShapeEventArgs.cs b/src/MW5.Api/Events/BeforeDeleteShapeEventArgs.cs
index 04bd9ced..0b3929a6 100644
--- a/src/MW5.Api/Events/BeforeDeleteShapeEventArgs.cs
+++ b/src/MW5.Api/Events/BeforeDeleteShapeEventArgs.cs
@@ -9,6 +9,14 @@ public class BeforeDeleteShapeEventArgs : EventArgs
     {
         private readonly _DMapEvents_BeforeDeleteShapeEvent _args;
 
+        public BeforeDeleteShapeEventArgs(DeleteTarget target, bool cancel)
+        {
+            _args = new _DMapEvents_BeforeDeleteShapeEvent(
+                (tkDeleteTarget) target,
+                cancel ? tkMwBoolean.blnTrue : tkMwBoolean.blnFalse
+            );
+        }
+
         internal BeforeDeleteShapeEventArgs(_DMapEvents_BeforeDeleteShapeEvent args)
         {
             _args = args;
diff --git a/src/MW5.Api/Events/BeforeShapeEditEventArgs.cs b/src/MW5.Api/Events/BeforeShapeEditEventArgs.cs
index 67f019fe..8b0c8dea 100644
--- a/src/MW5.Api/Events/BeforeShapeEditEventArgs.cs
+++ b/src/MW5.Api/Events/BeforeShapeEditEventArgs.cs
@@ -17,6 +17,13 @@ internal BeforeShapeEditEventArgs(_DMapEvents_BeforeShapeEditEvent args)
             }
         }
 
+        public BeforeShapeEditEventArgs(int layerHandle, int shapeIndex, bool cancel) : this(new _DMapEvents_BeforeShapeEditEvent(
+                layerHandle,
+                shapeIndex,
+                cancel? tkMwBoolean.blnTrue : tkMwBoolean.blnFalse
+            ))
+        { }
+
         public int LayerHandle
         {
             get { return _args.layerHandle; }
diff --git a/src/Plugins/MW5.ShapeEditor/Services/GeoprocessingService.cs b/src/Plugins/MW5.ShapeEditor/Services/GeoprocessingService.cs
index 26a216e0..f3d81269 100644
--- a/src/Plugins/MW5.ShapeEditor/Services/GeoprocessingService.cs
+++ b/src/Plugins/MW5.ShapeEditor/Services/GeoprocessingService.cs
@@ -1,7 +1,9 @@
 using System;
 using MW5.Api.Enums;
+using MW5.Api.Events;
 using MW5.Api.Interfaces;
 using MW5.Api.Legend.Events;
+using MW5.Api.Map;
 using MW5.Plugins.Interfaces;
 using MW5.Plugins.Services;
 using MW5.Plugins.ShapeEditor.Operations;
@@ -183,10 +185,16 @@ private void RemoveSelectedShapesNoPrompt(IMuteMap map, IFeatureSet fs, int laye
             var features = fs.Features;
             for (var i = features.Count - 1; i >= 0; i--)
             {
+
                 if (!features[i].Selected) continue;
 
-                list.Add(UndoOperation.RemoveShape, layerHandle, i);
-                features.EditDelete(i);
+                if (features[i].Selected)
+                {
+                    _broadcaster.BroadcastEvent(p => p.BeforeShapeEdit_, _context.Map, new BeforeShapeEditEventArgs(layerHandle, i, false));
+                    list.Add(UndoOperation.RemoveShape, layerHandle, i);
+                    features.EditDelete(i);
+                }
+
             }
 
             list.EndBatch();

From 9a489f5ec6c56fc6b772269b8bb922d7dcf1bc97 Mon Sep 17 00:00:00 2001
From: Mathijs Dumon <mathijs.Dumon@gmail.com>
Date: Mon, 13 May 2019 09:42:21 +0200
Subject: [PATCH 04/15] MW5CORE-224 MW5CORE-225 MW5CORE-226 MW5CORE-227
 MW5CORE-228 MW5CORE-229 MW5CORE-230 Adding events, making events cancellable,
 allowing plugins to have more than one registered event delegate, changing to
 Csharp 7.1

---
 .../Events/BeforeDeleteShapeEventArgs.cs      |  3 +-
 .../Events/BeforeShapeEditEventArgs.cs        |  3 +-
 .../Events/LayerProjectionIsEmptyEventArgs.cs |  5 ++-
 .../Events/ProjectionChangedEventArgs.cs      |  5 ++-
 src/MW5.Api/Events/ValidateShapeEventArgs.cs  |  8 ++--
 src/MW5.Api/Interfaces/ICancellableEvent.cs   |  7 ++++
 .../Events/DatasourceCancelEventArgs.cs       |  2 +-
 .../Legend/Events/LayerCancelEventArgs.cs     |  5 ++-
 src/MW5.Api/MW5.Api.csproj                    |  3 ++
 src/MW5.Attributes/MW5.Attributes.csproj      |  2 +
 src/MW5.DI/MW5.DI.Castle/MW5.DI.Castle.csproj |  2 +
 .../MW5.DI.LightInject.csproj                 |  2 +
 .../MW5.DI.Ninject/MW5.DI.Ninject.csproj      |  2 +
 src/MW5.DI/MW5.DI.Unity/MW5.DI.Unity.csproj   |  2 +
 src/MW5.Data/MW5.Data.csproj                  |  2 +
 src/MW5.Gdal/MW5.Gdal.csproj                  |  2 +
 src/MW5.Mvp/MW5.Mvp.csproj                    |  2 +
 src/MW5.Plugins/Concrete/BasePlugin.cs        | 21 ++++++++++
 .../Events/DockPanelCancelEventArgs.cs        |  5 ++-
 .../Events/LayerCancelEventArgs.cs            |  5 ++-
 src/MW5.Plugins/Events/TileProviderArgs.cs    |  3 +-
 src/MW5.Plugins/MW5.Plugins.csproj            |  4 ++
 src/MW5.Plugins/PluginBroadcaster.cs          | 22 +++++++----
 .../Services/ILayerEditingService.cs          |  1 +
 src/MW5.PostBuild/MW5.PostBuild.csproj        |  2 +
 src/MW5.Projections/MW5.Projections.csproj    |  2 +
 src/MW5.Services/Concrete/ProjectService.cs   | 14 ++++++-
 src/MW5.Services/MW5.Services.csproj          |  2 +
 src/MW5.Shared/MW5.Shared.csproj              |  2 +
 src/MW5.Tiles/MW5.Tiles.csproj                |  2 +
 src/MW5.Tools/MW5.Tools.csproj                |  2 +
 src/MW5.UI/MW5.UI.csproj                      |  2 +
 src/MW5/MW5.csproj                            |  2 +
 .../MW5.DebugWindow/MW5.DebugWindow.csproj    |  2 +
 .../MW5.Identifier/MW5.Identifier.csproj      |  2 +
 .../MW5.ImageRegistration.csproj              |  2 +
 src/Plugins/MW5.Printing/MW5.Printing.csproj  |  2 +
 .../MW5.Repository/MW5.Repository.csproj      |  2 +
 .../MW5.ShapeEditor/MW5.ShapeEditor.csproj    |  2 +
 src/Plugins/MW5.ShapeEditor/MapListener.cs    |  2 +-
 .../Services/GeoprocessingService.cs          | 39 +++++++++++++------
 .../Services/LayerEditingService.cs           | 23 ++++++++++-
 .../MW5.Symbology/MW5.Symbology.csproj        |  2 +
 .../MW5.TableEditor/MW5.TableEditor.csproj    |  2 +
 .../MW5.TemplatePlugin.csproj                 |  2 +
 src/Plugins/MW5.Toolbox/MW5.Toolbox.csproj    |  2 +
 src/Utility/BindingListView.csproj            |  2 +
 test/MW5.Api.Test/MW5.API.Test.csproj         |  2 +
 test/MW5.Test/MW5.Test.csproj                 |  2 +
 test/MW5.Tools.Test/MW5.Tools.Test.csproj     |  2 +
 50 files changed, 200 insertions(+), 40 deletions(-)
 create mode 100644 src/MW5.Api/Interfaces/ICancellableEvent.cs

diff --git a/src/MW5.Api/Events/BeforeDeleteShapeEventArgs.cs b/src/MW5.Api/Events/BeforeDeleteShapeEventArgs.cs
index 0b3929a6..ee3b2b3a 100644
--- a/src/MW5.Api/Events/BeforeDeleteShapeEventArgs.cs
+++ b/src/MW5.Api/Events/BeforeDeleteShapeEventArgs.cs
@@ -2,10 +2,11 @@
 using AxMapWinGIS;
 using MapWinGIS;
 using MW5.Api.Enums;
+using MW5.Api.Interfaces;
 
 namespace MW5.Api.Events
 {
-    public class BeforeDeleteShapeEventArgs : EventArgs
+    public class BeforeDeleteShapeEventArgs : EventArgs, ICancellableEvent
     {
         private readonly _DMapEvents_BeforeDeleteShapeEvent _args;
 
diff --git a/src/MW5.Api/Events/BeforeShapeEditEventArgs.cs b/src/MW5.Api/Events/BeforeShapeEditEventArgs.cs
index 8b0c8dea..c3a31512 100644
--- a/src/MW5.Api/Events/BeforeShapeEditEventArgs.cs
+++ b/src/MW5.Api/Events/BeforeShapeEditEventArgs.cs
@@ -1,10 +1,11 @@
 using System;
 using AxMapWinGIS;
 using MapWinGIS;
+using MW5.Api.Interfaces;
 
 namespace MW5.Api.Events
 {
-    public class BeforeShapeEditEventArgs : EventArgs
+    public class BeforeShapeEditEventArgs : EventArgs, ICancellableEvent
     {
         private readonly _DMapEvents_BeforeShapeEditEvent _args;
 
diff --git a/src/MW5.Api/Events/LayerProjectionIsEmptyEventArgs.cs b/src/MW5.Api/Events/LayerProjectionIsEmptyEventArgs.cs
index ef508b7f..205101f8 100644
--- a/src/MW5.Api/Events/LayerProjectionIsEmptyEventArgs.cs
+++ b/src/MW5.Api/Events/LayerProjectionIsEmptyEventArgs.cs
@@ -1,10 +1,11 @@
 using System;
 using AxMapWinGIS;
 using MapWinGIS;
+using MW5.Api.Interfaces;
 
 namespace MW5.Api.Events
 {
-    public class LayerProjectionIsEmptyEventArgs: EventArgs
+    public class LayerProjectionIsEmptyEventArgs: EventArgs, ICancellableEvent
     {
         private readonly _DMapEvents_LayerProjectionIsEmptyEvent _args;
 
@@ -27,5 +28,7 @@ public bool CancelAdding
             get { return _args.cancelAdding == tkMwBoolean.blnTrue; }
             set { _args.cancelAdding = value ? tkMwBoolean.blnTrue : tkMwBoolean.blnFalse; }
         }
+
+        public bool Cancel => CancelAdding;
     }
 }
diff --git a/src/MW5.Api/Events/ProjectionChangedEventArgs.cs b/src/MW5.Api/Events/ProjectionChangedEventArgs.cs
index cdcb8211..0b811cb5 100644
--- a/src/MW5.Api/Events/ProjectionChangedEventArgs.cs
+++ b/src/MW5.Api/Events/ProjectionChangedEventArgs.cs
@@ -1,10 +1,11 @@
 using System;
 using AxMapWinGIS;
 using MapWinGIS;
+using MW5.Api.Interfaces;
 
 namespace MW5.Api.Events
 {
-    public class ProjectionMismatchEventArgs: EventArgs
+    public class ProjectionMismatchEventArgs: EventArgs, ICancellableEvent
     {
         private readonly _DMapEvents_ProjectionMismatchEvent _args;
 
@@ -23,6 +24,8 @@ public bool CancelAdding
             set { _args.cancelAdding = value ? tkMwBoolean.blnTrue : tkMwBoolean.blnFalse; }
         }
 
+        public bool Cancel => CancelAdding;
+
         public bool Reproject
         {
             get { return _args.reproject == tkMwBoolean.blnTrue; }
diff --git a/src/MW5.Api/Events/ValidateShapeEventArgs.cs b/src/MW5.Api/Events/ValidateShapeEventArgs.cs
index b5ef7ea5..45c885f7 100644
--- a/src/MW5.Api/Events/ValidateShapeEventArgs.cs
+++ b/src/MW5.Api/Events/ValidateShapeEventArgs.cs
@@ -6,7 +6,7 @@
 
 namespace MW5.Api.Events
 {
-    public class ValidateShapeEventArgs : EventArgs
+    public class ValidateShapeEventArgs : EventArgs, ICancellableEvent
     {
         private readonly _DMapEvents_ValidateShapeEvent _args;
 
@@ -19,10 +19,10 @@ internal ValidateShapeEventArgs(_DMapEvents_ValidateShapeEvent args)
             }
         }
 
-        public tkMwBoolean Cancel
+        public bool Cancel
         {
-            get { return _args.cancel; }
-            set { _args.cancel = value; }
+            get { return _args.cancel == tkMwBoolean.blnTrue; }
+            set { _args.cancel = value ? tkMwBoolean.blnTrue : tkMwBoolean.blnFalse; }
         }
 
         public int LayerHandle
diff --git a/src/MW5.Api/Interfaces/ICancellableEvent.cs b/src/MW5.Api/Interfaces/ICancellableEvent.cs
new file mode 100644
index 00000000..5b736ccf
--- /dev/null
+++ b/src/MW5.Api/Interfaces/ICancellableEvent.cs
@@ -0,0 +1,7 @@
+namespace MW5.Api.Interfaces
+{
+    public interface ICancellableEvent
+    {
+        bool Cancel { get; }
+    }
+}
\ No newline at end of file
diff --git a/src/MW5.Api/Legend/Events/DatasourceCancelEventArgs.cs b/src/MW5.Api/Legend/Events/DatasourceCancelEventArgs.cs
index 488c5d1b..02841217 100644
--- a/src/MW5.Api/Legend/Events/DatasourceCancelEventArgs.cs
+++ b/src/MW5.Api/Legend/Events/DatasourceCancelEventArgs.cs
@@ -8,7 +8,7 @@
 
 namespace MW5.Api.Legend.Events
 {
-    public class DatasourceCancelEventArgs: CancelEventArgs
+    public class DatasourceCancelEventArgs: CancelEventArgs, ICancellableEvent
     {
         public DatasourceCancelEventArgs(ILayerSource datasource)
         {
diff --git a/src/MW5.Api/Legend/Events/LayerCancelEventArgs.cs b/src/MW5.Api/Legend/Events/LayerCancelEventArgs.cs
index 9166be93..28ed5ddf 100644
--- a/src/MW5.Api/Legend/Events/LayerCancelEventArgs.cs
+++ b/src/MW5.Api/Legend/Events/LayerCancelEventArgs.cs
@@ -1,4 +1,5 @@
-using System;
+using MW5.Api.Interfaces;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -6,7 +7,7 @@
 
 namespace MW5.Api.Legend.Events
 {
-    public class LayerCancelEventArgs: LayerEventArgs
+    public class LayerCancelEventArgs: LayerEventArgs, ICancellableEvent
     {
         public bool NewState { get; internal set; }
         public bool Cancel { get; set; }
diff --git a/src/MW5.Api/MW5.Api.csproj b/src/MW5.Api/MW5.Api.csproj
index 58b35263..8554f37c 100644
--- a/src/MW5.Api/MW5.Api.csproj
+++ b/src/MW5.Api/MW5.Api.csproj
@@ -24,6 +24,7 @@
     <Prefer32Bit>false</Prefer32Bit>
     <DocumentationFile>bin\x86\Debug\MW5.Api.XML</DocumentationFile>
     <NoWarn>1591</NoWarn>
+    <LangVersion>7.1</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <OutputPath>bin\x86\Release\</OutputPath>
@@ -34,6 +35,7 @@
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <Prefer32Bit>false</Prefer32Bit>
+    <LangVersion>7.1</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
@@ -89,6 +91,7 @@
     <Compile Include="Concrete\ImageBandCollection.cs" />
     <Compile Include="Concrete\RasterHistogram.cs" />
     <Compile Include="Concrete\WmsSource.cs" />
+    <Compile Include="Interfaces\ICancellableEvent.cs" />
     <Compile Include="Events\LockedEventArgs.cs" />
     <Compile Include="Events\UpdateJoinEventArgs.cs" />
     <Compile Include="Helpers\AttributeTableHelper.cs" />
diff --git a/src/MW5.Attributes/MW5.Attributes.csproj b/src/MW5.Attributes/MW5.Attributes.csproj
index d0bd1b53..224dc4cc 100644
--- a/src/MW5.Attributes/MW5.Attributes.csproj
+++ b/src/MW5.Attributes/MW5.Attributes.csproj
@@ -21,6 +21,7 @@
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <LangVersion>7.1</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <OutputPath>bin\x86\Release\</OutputPath>
@@ -30,6 +31,7 @@
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <LangVersion>7.1</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
diff --git a/src/MW5.DI/MW5.DI.Castle/MW5.DI.Castle.csproj b/src/MW5.DI/MW5.DI.Castle/MW5.DI.Castle.csproj
index 27b96680..48c53453 100644
--- a/src/MW5.DI/MW5.DI.Castle/MW5.DI.Castle.csproj
+++ b/src/MW5.DI/MW5.DI.Castle/MW5.DI.Castle.csproj
@@ -23,6 +23,7 @@
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <LangVersion>7.1</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <OutputPath>bin\x86\Release\</OutputPath>
@@ -32,6 +33,7 @@
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <LangVersion>7.1</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
diff --git a/src/MW5.DI/MW5.DI.LightInject/MW5.DI.LightInject.csproj b/src/MW5.DI/MW5.DI.LightInject/MW5.DI.LightInject.csproj
index fa35ccb8..eb47fbae 100644
--- a/src/MW5.DI/MW5.DI.LightInject/MW5.DI.LightInject.csproj
+++ b/src/MW5.DI/MW5.DI.LightInject/MW5.DI.LightInject.csproj
@@ -23,6 +23,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <LangVersion>7.1</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -31,6 +32,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <LangVersion>7.1</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
diff --git a/src/MW5.DI/MW5.DI.Ninject/MW5.DI.Ninject.csproj b/src/MW5.DI/MW5.DI.Ninject/MW5.DI.Ninject.csproj
index 816670b8..fc309ab1 100644
--- a/src/MW5.DI/MW5.DI.Ninject/MW5.DI.Ninject.csproj
+++ b/src/MW5.DI/MW5.DI.Ninject/MW5.DI.Ninject.csproj
@@ -23,6 +23,7 @@
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <LangVersion>7.1</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <OutputPath>bin\x86\Release\</OutputPath>
@@ -32,6 +33,7 @@
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <LangVersion>7.1</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
diff --git a/src/MW5.DI/MW5.DI.Unity/MW5.DI.Unity.csproj b/src/MW5.DI/MW5.DI.Unity/MW5.DI.Unity.csproj
index c961d1dc..13e5ceda 100644
--- a/src/MW5.DI/MW5.DI.Unity/MW5.DI.Unity.csproj
+++ b/src/MW5.DI/MW5.DI.Unity/MW5.DI.Unity.csproj
@@ -23,6 +23,7 @@
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <LangVersion>7.1</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <OutputPath>bin\x86\Release\</OutputPath>
@@ -32,6 +33,7 @@
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <LangVersion>7.1</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
diff --git a/src/MW5.Data/MW5.Data.csproj b/src/MW5.Data/MW5.Data.csproj
index e841b54a..11688b78 100644
--- a/src/MW5.Data/MW5.Data.csproj
+++ b/src/MW5.Data/MW5.Data.csproj
@@ -25,6 +25,7 @@
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <LangVersion>7.1</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <OutputPath>bin\x86\Release\</OutputPath>
@@ -34,6 +35,7 @@
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <LangVersion>7.1</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
diff --git a/src/MW5.Gdal/MW5.Gdal.csproj b/src/MW5.Gdal/MW5.Gdal.csproj
index 1db35494..9355efea 100644
--- a/src/MW5.Gdal/MW5.Gdal.csproj
+++ b/src/MW5.Gdal/MW5.Gdal.csproj
@@ -21,6 +21,7 @@
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <LangVersion>7.1</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <OutputPath>bin\x86\Release\</OutputPath>
@@ -30,6 +31,7 @@
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <LangVersion>7.1</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
diff --git a/src/MW5.Mvp/MW5.Mvp.csproj b/src/MW5.Mvp/MW5.Mvp.csproj
index f4f19333..70a9b229 100644
--- a/src/MW5.Mvp/MW5.Mvp.csproj
+++ b/src/MW5.Mvp/MW5.Mvp.csproj
@@ -36,6 +36,7 @@
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <LangVersion>7.1</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <OutputPath>bin\x86\Release\</OutputPath>
@@ -45,6 +46,7 @@
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <LangVersion>7.1</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
diff --git a/src/MW5.Plugins/Concrete/BasePlugin.cs b/src/MW5.Plugins/Concrete/BasePlugin.cs
index adf6a1cb..820680b4 100644
--- a/src/MW5.Plugins/Concrete/BasePlugin.cs
+++ b/src/MW5.Plugins/Concrete/BasePlugin.cs
@@ -106,6 +106,9 @@ internal void SetApplicationPlugin(bool value)
         internal EventHandler<MenuItemEventArgs> ItemClicked_;
         internal EventHandler<CancelEventArgs> ProjectClosing_;
         internal EventHandler<EventArgs> ProjectClosed_;
+        internal EventHandler<CancelEventArgs> ProjectSaving_;
+        internal EventHandler<EventArgs> ProjectSaved_;
+        internal EventHandler<LayerCancelEventArgs> BeforeLayerEditingChanged_;
         internal EventHandler<LayerEventArgs> LayerEditingChanged_;
         internal EventHandler<LayerCancelEventArgs> BeforeRemoveLayer_;
         internal EventHandler<EventArgs> ViewUpdating_;
@@ -141,6 +144,12 @@ public event EventHandler<LayerEventArgs> LayerEditingChanged
             remove { LayerEditingChanged_ -= value; }
         }
 
+        public event EventHandler<LayerCancelEventArgs> BeforeLayerEditingChanged
+        {
+            add { BeforeLayerEditingChanged_ += value; }
+            remove { BeforeLayerEditingChanged_ -= value; }
+        }
+
         public event EventHandler<LayerEventArgs> LayerFeatureCountChanged
         {
             add { LayerFeatureCountChanged_ += value; }
@@ -171,6 +180,18 @@ public event EventHandler<MenuItemEventArgs> ItemClicked
             remove { ItemClicked_ -= value; }
         }
 
+        public event EventHandler<CancelEventArgs> ProjectSaving
+        {
+            add { ProjectSaving_ += value; }
+            remove { ProjectSaving_ -= value; }
+        }
+
+        public event EventHandler<EventArgs> ProjectSaved
+        {
+            add { ProjectSaved_ += value; }
+            remove { ProjectSaved_ -= value; }
+        }
+
         public event EventHandler<CancelEventArgs> ProjectClosing
         {
             add { ProjectClosing_ += value; }
diff --git a/src/MW5.Plugins/Events/DockPanelCancelEventArgs.cs b/src/MW5.Plugins/Events/DockPanelCancelEventArgs.cs
index 2ac77184..78b02c06 100644
--- a/src/MW5.Plugins/Events/DockPanelCancelEventArgs.cs
+++ b/src/MW5.Plugins/Events/DockPanelCancelEventArgs.cs
@@ -1,8 +1,9 @@
-using MW5.Plugins.Interfaces;
+using MW5.Api.Interfaces;
+using MW5.Plugins.Interfaces;
 
 namespace MW5.Plugins.Events
 {
-    public class DockPanelCancelEventArgs: DockPanelEventArgs
+    public class DockPanelCancelEventArgs: DockPanelEventArgs, ICancellableEvent
     {
         public DockPanelCancelEventArgs(IDockPanel panel, string key) : base(panel, key)
         {
diff --git a/src/MW5.Plugins/Events/LayerCancelEventArgs.cs b/src/MW5.Plugins/Events/LayerCancelEventArgs.cs
index dfa6b3f2..1a7014e4 100644
--- a/src/MW5.Plugins/Events/LayerCancelEventArgs.cs
+++ b/src/MW5.Plugins/Events/LayerCancelEventArgs.cs
@@ -1,9 +1,10 @@
-using System;
+using MW5.Api.Interfaces;
+using System;
 using System.ComponentModel;
 
 namespace MW5.Plugins.Events
 {
-    public class LayerCancelEventArgs: CancelEventArgs
+    public class LayerCancelEventArgs: CancelEventArgs, ICancellableEvent
     {
         public LayerCancelEventArgs(int layerHandle)
         {
diff --git a/src/MW5.Plugins/Events/TileProviderArgs.cs b/src/MW5.Plugins/Events/TileProviderArgs.cs
index 4647debd..f42128c9 100644
--- a/src/MW5.Plugins/Events/TileProviderArgs.cs
+++ b/src/MW5.Plugins/Events/TileProviderArgs.cs
@@ -5,10 +5,11 @@
 using System.Text;
 using System.Threading.Tasks;
 using MW5.Api.Enums;
+using MW5.Api.Interfaces;
 
 namespace MW5.Plugins.Events
 {
-    public class TileProviderArgs: CancelEventArgs
+    public class TileProviderArgs: CancelEventArgs, ICancellableEvent
     {
         public TileProviderArgs(int providerId)
         {
diff --git a/src/MW5.Plugins/MW5.Plugins.csproj b/src/MW5.Plugins/MW5.Plugins.csproj
index 546cecf1..fe8c94cb 100644
--- a/src/MW5.Plugins/MW5.Plugins.csproj
+++ b/src/MW5.Plugins/MW5.Plugins.csproj
@@ -36,6 +36,7 @@
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <LangVersion>7.1</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <OutputPath>bin\x86\Release\</OutputPath>
@@ -45,6 +46,7 @@
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <LangVersion>7.1</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
@@ -54,6 +56,7 @@
     <PlatformTarget>x64</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <LangVersion>7.1</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
     <OutputPath>bin\x64\Release\</OutputPath>
@@ -63,6 +66,7 @@
     <PlatformTarget>x64</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <LangVersion>7.1</LangVersion>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
diff --git a/src/MW5.Plugins/PluginBroadcaster.cs b/src/MW5.Plugins/PluginBroadcaster.cs
index 4e42b579..7c1cbd6f 100644
--- a/src/MW5.Plugins/PluginBroadcaster.cs
+++ b/src/MW5.Plugins/PluginBroadcaster.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Diagnostics;
 using System.Linq;
 using System.Linq.Expressions;
@@ -105,6 +106,14 @@ private void BroadcastEvent<T>(MemberExpression expression, object sender, T arg
 
             var singleTargetArgs = args as SingleTargetEventArgs;
 
+            bool IsCancelled() => (
+                (args is ICancellableEvent bargs && bargs.Cancel) ||
+                (args is CancelEventArgs cargs && cargs.Cancel)
+            );
+            bool StopBubbling() => (
+                (args is SingleTargetEventArgs sargs && sargs.Handled) || IsCancelled()
+            );
+
             var fieldInfo = GetEventField(eventName);
             if (fieldInfo != null)
             {
@@ -120,17 +129,16 @@ private void BroadcastEvent<T>(MemberExpression expression, object sender, T arg
                     var del = fieldInfo.GetValue(p) as MulticastDelegate;
                     if (del != null)
                     {
-                        if (del.GetInvocationList().Any())
+                        var invlst = del.GetInvocationList();
+                        foreach (var adel in invlst)
                         {
-                            del.Method.Invoke(del.Target, new[] { sender, args });
+                            adel.Method.Invoke(adel.Target, new[] { sender, args });
+                            if (StopBubbling())
+                                break;
                         }
                     }
-
-                    // in case we want only one handler
-                    if (singleTargetArgs != null && singleTargetArgs.Handled)
-                    {
+                    if (StopBubbling())
                         break;
-                    }
                 }
             }
         }
diff --git a/src/MW5.Plugins/Services/ILayerEditingService.cs b/src/MW5.Plugins/Services/ILayerEditingService.cs
index 4741fb79..67dd6f96 100644
--- a/src/MW5.Plugins/Services/ILayerEditingService.cs
+++ b/src/MW5.Plugins/Services/ILayerEditingService.cs
@@ -4,6 +4,7 @@ public interface ILayerEditingService
     {
         void ToggleVectorLayerEditing();
         bool SaveLayerChanges(int layerHandle);
+        bool DiscardLayerChanges(int layerHandle);
         void CreateLayer();
         void ToggleSnapToActiveLayer();
         void ToggleSnapToAllLayers();
diff --git a/src/MW5.PostBuild/MW5.PostBuild.csproj b/src/MW5.PostBuild/MW5.PostBuild.csproj
index c62b2630..77649f2c 100644
--- a/src/MW5.PostBuild/MW5.PostBuild.csproj
+++ b/src/MW5.PostBuild/MW5.PostBuild.csproj
@@ -21,6 +21,7 @@
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <LangVersion>7.1</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <DefineConstants>TRACE</DefineConstants>
@@ -29,6 +30,7 @@
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <LangVersion>7.1</LangVersion>
   </PropertyGroup>
   <PropertyGroup>
     <StartupObject />
diff --git a/src/MW5.Projections/MW5.Projections.csproj b/src/MW5.Projections/MW5.Projections.csproj
index fd415cb4..d870a07e 100644
--- a/src/MW5.Projections/MW5.Projections.csproj
+++ b/src/MW5.Projections/MW5.Projections.csproj
@@ -25,6 +25,7 @@
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <LangVersion>7.1</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <OutputPath>bin\x86\Release\</OutputPath>
@@ -34,6 +35,7 @@
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <LangVersion>7.1</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
diff --git a/src/MW5.Services/Concrete/ProjectService.cs b/src/MW5.Services/Concrete/ProjectService.cs
index 8966728a..9d1b0cbd 100644
--- a/src/MW5.Services/Concrete/ProjectService.cs
+++ b/src/MW5.Services/Concrete/ProjectService.cs
@@ -169,9 +169,18 @@ private bool TryCloseCore()
 
         public bool Save()
         {
+            var args = new CancelEventArgs();
+
             string filename = _filename;
-            var state = State; 
-            
+            var state = State;
+
+            _broadcaster.BroadcastEvent(p => p.ProjectSaving_, this, args);
+            if (args.Cancel)
+            {
+                return false;
+            }
+
+
             bool newProject = state == ProjectState.NotSaved || state == ProjectState.Empty;
             if (newProject)
             {
@@ -188,6 +197,7 @@ public bool Save()
                 // OnProjectChanged();
             }
 
+            _broadcaster.BroadcastEvent(p => p.ProjectSaved_, this, args);
             return true;
         }
 
diff --git a/src/MW5.Services/MW5.Services.csproj b/src/MW5.Services/MW5.Services.csproj
index c61b3cf5..80bd3571 100644
--- a/src/MW5.Services/MW5.Services.csproj
+++ b/src/MW5.Services/MW5.Services.csproj
@@ -23,6 +23,7 @@
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <LangVersion>7.1</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <OutputPath>bin\x86\Release\</OutputPath>
@@ -32,6 +33,7 @@
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <LangVersion>7.1</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
diff --git a/src/MW5.Shared/MW5.Shared.csproj b/src/MW5.Shared/MW5.Shared.csproj
index 5d076dad..6f6feef8 100644
--- a/src/MW5.Shared/MW5.Shared.csproj
+++ b/src/MW5.Shared/MW5.Shared.csproj
@@ -23,6 +23,7 @@
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <LangVersion>7.1</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <OutputPath>bin\x86\Release\</OutputPath>
@@ -32,6 +33,7 @@
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <LangVersion>7.1</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
diff --git a/src/MW5.Tiles/MW5.Tiles.csproj b/src/MW5.Tiles/MW5.Tiles.csproj
index a4dc3e27..429e4afb 100644
--- a/src/MW5.Tiles/MW5.Tiles.csproj
+++ b/src/MW5.Tiles/MW5.Tiles.csproj
@@ -23,6 +23,7 @@
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <LangVersion>7.1</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <OutputPath>bin\x86\Release\</OutputPath>
@@ -32,6 +33,7 @@
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <LangVersion>7.1</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
diff --git a/src/MW5.Tools/MW5.Tools.csproj b/src/MW5.Tools/MW5.Tools.csproj
index 549bcdca..cd15d667 100644
--- a/src/MW5.Tools/MW5.Tools.csproj
+++ b/src/MW5.Tools/MW5.Tools.csproj
@@ -21,6 +21,7 @@
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <LangVersion>7.1</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <OutputPath>bin\x86\Release\</OutputPath>
@@ -30,6 +31,7 @@
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <LangVersion>7.1</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
diff --git a/src/MW5.UI/MW5.UI.csproj b/src/MW5.UI/MW5.UI.csproj
index 4b152ea7..58e24174 100644
--- a/src/MW5.UI/MW5.UI.csproj
+++ b/src/MW5.UI/MW5.UI.csproj
@@ -21,6 +21,7 @@
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <LangVersion>7.1</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <OutputPath>bin\x86\Release\</OutputPath>
@@ -30,6 +31,7 @@
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <LangVersion>7.1</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
diff --git a/src/MW5/MW5.csproj b/src/MW5/MW5.csproj
index c49812c8..4c336995 100644
--- a/src/MW5/MW5.csproj
+++ b/src/MW5/MW5.csproj
@@ -43,6 +43,7 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <Prefer32Bit>true</Prefer32Bit>
     <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
+    <LangVersion>7.1</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <DefineConstants>TRACE</DefineConstants>
@@ -53,6 +54,7 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <Prefer32Bit>true</Prefer32Bit>
     <GenerateSerializationAssemblies>On</GenerateSerializationAssemblies>
+    <LangVersion>7.1</LangVersion>
   </PropertyGroup>
   <PropertyGroup>
     <ApplicationIcon>MW5.ico</ApplicationIcon>
diff --git a/src/Plugins/MW5.DebugWindow/MW5.DebugWindow.csproj b/src/Plugins/MW5.DebugWindow/MW5.DebugWindow.csproj
index dd3b0a16..43f7a7ec 100644
--- a/src/Plugins/MW5.DebugWindow/MW5.DebugWindow.csproj
+++ b/src/Plugins/MW5.DebugWindow/MW5.DebugWindow.csproj
@@ -21,6 +21,7 @@
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <LangVersion>7.1</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <DefineConstants>TRACE</DefineConstants>
@@ -29,6 +30,7 @@
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <LangVersion>7.1</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
diff --git a/src/Plugins/MW5.Identifier/MW5.Identifier.csproj b/src/Plugins/MW5.Identifier/MW5.Identifier.csproj
index ee2fa967..0b3e7430 100644
--- a/src/Plugins/MW5.Identifier/MW5.Identifier.csproj
+++ b/src/Plugins/MW5.Identifier/MW5.Identifier.csproj
@@ -21,6 +21,7 @@
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <LangVersion>7.1</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <DefineConstants>TRACE</DefineConstants>
@@ -29,6 +30,7 @@
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <LangVersion>7.1</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
diff --git a/src/Plugins/MW5.ImageRegistration/MW5.ImageRegistration.csproj b/src/Plugins/MW5.ImageRegistration/MW5.ImageRegistration.csproj
index 643efb85..bbeda399 100644
--- a/src/Plugins/MW5.ImageRegistration/MW5.ImageRegistration.csproj
+++ b/src/Plugins/MW5.ImageRegistration/MW5.ImageRegistration.csproj
@@ -21,6 +21,7 @@
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <LangVersion>7.1</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <DefineConstants>TRACE</DefineConstants>
@@ -29,6 +30,7 @@
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <LangVersion>7.1</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
diff --git a/src/Plugins/MW5.Printing/MW5.Printing.csproj b/src/Plugins/MW5.Printing/MW5.Printing.csproj
index 3dbf8df2..1d434616 100644
--- a/src/Plugins/MW5.Printing/MW5.Printing.csproj
+++ b/src/Plugins/MW5.Printing/MW5.Printing.csproj
@@ -45,6 +45,7 @@
     <CodeAnalysisRuleDirectories>;C:\Program Files\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
     <Optimize>true</Optimize>
     <Prefer32Bit>false</Prefer32Bit>
+    <LangVersion>7.1</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <DefineConstants>TRACE</DefineConstants>
@@ -60,6 +61,7 @@
     <CodeAnalysisRuleDirectories>;C:\Program Files\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
     <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
     <Prefer32Bit>false</Prefer32Bit>
+    <LangVersion>7.1</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
diff --git a/src/Plugins/MW5.Repository/MW5.Repository.csproj b/src/Plugins/MW5.Repository/MW5.Repository.csproj
index 2e22c7b7..1daadfea 100644
--- a/src/Plugins/MW5.Repository/MW5.Repository.csproj
+++ b/src/Plugins/MW5.Repository/MW5.Repository.csproj
@@ -21,6 +21,7 @@
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <LangVersion>7.1</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <DefineConstants>TRACE</DefineConstants>
@@ -29,6 +30,7 @@
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <LangVersion>7.1</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
diff --git a/src/Plugins/MW5.ShapeEditor/MW5.ShapeEditor.csproj b/src/Plugins/MW5.ShapeEditor/MW5.ShapeEditor.csproj
index 68cef8f7..6bf29816 100644
--- a/src/Plugins/MW5.ShapeEditor/MW5.ShapeEditor.csproj
+++ b/src/Plugins/MW5.ShapeEditor/MW5.ShapeEditor.csproj
@@ -21,6 +21,7 @@
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <LangVersion>7.1</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <DefineConstants>TRACE</DefineConstants>
@@ -29,6 +30,7 @@
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <LangVersion>7.1</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
diff --git a/src/Plugins/MW5.ShapeEditor/MapListener.cs b/src/Plugins/MW5.ShapeEditor/MapListener.cs
index 480a9e8c..0ce38744 100644
--- a/src/Plugins/MW5.ShapeEditor/MapListener.cs
+++ b/src/Plugins/MW5.ShapeEditor/MapListener.cs
@@ -39,7 +39,7 @@ public MapListener(IAppContext context, ShapeEditor plugin, ContextMenuPresenter
 
         private void OnBeforeDeleteShape(IMuteMap map, BeforeDeleteShapeEventArgs e)
         {
-            if (e.Target == DeleteTarget.Vertex && Control.ModifierKeys.HasFlag(Keys.Control))
+            if (e.Cancel || (e.Target == DeleteTarget.Vertex && Control.ModifierKeys.HasFlag(Keys.Control)))
             {
                 // don't bother user with prompt
                 return;
diff --git a/src/Plugins/MW5.ShapeEditor/Services/GeoprocessingService.cs b/src/Plugins/MW5.ShapeEditor/Services/GeoprocessingService.cs
index f3d81269..dcebf4f1 100644
--- a/src/Plugins/MW5.ShapeEditor/Services/GeoprocessingService.cs
+++ b/src/Plugins/MW5.ShapeEditor/Services/GeoprocessingService.cs
@@ -1,4 +1,7 @@
 using System;
+using System.Collections.Generic;
+using System.Windows.Forms;
+using MW5.Api;
 using MW5.Api.Enums;
 using MW5.Api.Events;
 using MW5.Api.Interfaces;
@@ -179,27 +182,39 @@ private void RemoveSelectedShapesWithPrompt(ILayer layer)
 
         private void RemoveSelectedShapesNoPrompt(IMuteMap map, IFeatureSet fs, int layerHandle)
         {
-            var list = map.History;
-            list.BeginBatch();
 
+            // First try to delete each feature - some may get cancelled
             var features = fs.Features;
-            for (var i = features.Count - 1; i >= 0; i--)
-            {
-
-                if (!features[i].Selected) continue;
+            var actualDeletes = new List<int>();
 
-                if (features[i].Selected)
+            try
+            {
+                for (int i = features.Count - 1; i >= 0; i--)
+                {
+                    if (!features[i].Selected) continue;
+
+                    var args = new BeforeDeleteShapeEventArgs(DeleteTarget.Shape, false);
+                    _broadcaster.BroadcastEvent(p => p.BeforeDeleteShape_, _context.Map, args);
+                    if (!args.Cancel && features.EditDelete(i))
+                    {
+                        actualDeletes.Add(i);
+                    }
+                }
+            }
+            finally
+            {
+                // Then add this to the undo history
+                var list = map.History;
+                list.BeginBatch();
+                foreach (var i in actualDeletes)
                 {
-                    _broadcaster.BroadcastEvent(p => p.BeforeShapeEdit_, _context.Map, new BeforeShapeEditEventArgs(layerHandle, i, false));
                     list.Add(UndoOperation.RemoveShape, layerHandle, i);
-                    features.EditDelete(i);
                 }
-
+                list.EndBatch();
             }
 
-            list.EndBatch();
-
             _broadcaster.BroadcastEvent(p => p.LayerFeatureCountChanged_, fs, new LayerEventArgs(layerHandle));
         }
+
     }
 }
diff --git a/src/Plugins/MW5.ShapeEditor/Services/LayerEditingService.cs b/src/Plugins/MW5.ShapeEditor/Services/LayerEditingService.cs
index fdab233c..0a106d8e 100644
--- a/src/Plugins/MW5.ShapeEditor/Services/LayerEditingService.cs
+++ b/src/Plugins/MW5.ShapeEditor/Services/LayerEditingService.cs
@@ -13,6 +13,7 @@
 using MW5.Services.Views;
 using MW5.Shared;
 using MW5.UI.Helpers;
+using LayerCancelEventArgs = MW5.Plugins.Events.LayerCancelEventArgs;
 
 namespace MW5.Plugins.ShapeEditor.Services
 {
@@ -47,6 +48,11 @@ public void ToggleVectorLayerEditing()
             var fs = _context.Layers.GetFeatureSet(handle);
             var ogrLayer = _context.Layers.GetVectorLayer(handle);
 
+            var args = new LayerCancelEventArgs(handle);
+            _broadcaster.BroadcastEvent(p => p.BeforeLayerEditingChanged_, _context.Legend, args);
+            if (args.Cancel)
+                return;
+
             if (fs == null)
             {
                 return;
@@ -87,13 +93,22 @@ public void ToggleVectorLayerEditing()
         /// Saves changes for the layer with specified handle.
         /// </summary>
         public bool SaveLayerChanges(int layerHandle)
+            => ProcessDiscardOrSave(layerHandle, SaveLayerChangesCore);
+
+        /// <summary>
+        /// Discard changes for the layer with the specfied handle
+        /// </summary>
+        public bool DiscardLayerChanges(int layerHandle)
+            => ProcessDiscardOrSave(layerHandle, DiscardChangesCore);
+
+        private bool ProcessDiscardOrSave(int layerHandle, Func<int, bool> action)
         {
             if (!_context.Map.GeometryEditor.SaveChanges())
             {
                 return false;
             }
 
-            bool success = SaveLayerChangesCore(layerHandle);
+            bool success = action(layerHandle);
 
             if (success)
             {
@@ -104,9 +119,11 @@ public bool SaveLayerChanges(int layerHandle)
                 }
             }
 
+            _broadcaster.BroadcastEvent(p => p.LayerEditingChanged_, _context.Legend, new LayerEventArgs(layerHandle));
             return success;
         }
 
+
         private bool SaveLayerChangesCore(int layerHandle)
         {
             string layerName = _context.Layers.ItemByHandle(layerHandle).Name;
@@ -193,7 +210,7 @@ private bool SaveOgrLayer(VectorLayer ogrLayer)
         /// <summary>
         /// Discards changes for the layer.
         /// </summary>
-        private void DiscardChangesCore(int layerHandle)
+        private bool DiscardChangesCore(int layerHandle)
         {
             var fs = _context.Layers.GetFeatureSet(layerHandle);
             if (fs == null)
@@ -221,6 +238,8 @@ private void DiscardChangesCore(int layerHandle)
             }
 
             CloseEditing(layerHandle);
+
+            return true;
         }
 
         /// <summary>
diff --git a/src/Plugins/MW5.Symbology/MW5.Symbology.csproj b/src/Plugins/MW5.Symbology/MW5.Symbology.csproj
index 75863ed4..8a924a08 100644
--- a/src/Plugins/MW5.Symbology/MW5.Symbology.csproj
+++ b/src/Plugins/MW5.Symbology/MW5.Symbology.csproj
@@ -25,6 +25,7 @@
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <LangVersion>7.1</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <DefineConstants>TRACE</DefineConstants>
@@ -33,6 +34,7 @@
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <LangVersion>7.1</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
diff --git a/src/Plugins/MW5.TableEditor/MW5.TableEditor.csproj b/src/Plugins/MW5.TableEditor/MW5.TableEditor.csproj
index 86ec8bca..b7f79363 100644
--- a/src/Plugins/MW5.TableEditor/MW5.TableEditor.csproj
+++ b/src/Plugins/MW5.TableEditor/MW5.TableEditor.csproj
@@ -8,6 +8,7 @@
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
+    <LangVersion>7.1</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
@@ -16,6 +17,7 @@
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>false</Prefer32Bit>
+    <LangVersion>7.1</LangVersion>
   </PropertyGroup>
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
diff --git a/src/Plugins/MW5.TemplatePlugin/MW5.TemplatePlugin.csproj b/src/Plugins/MW5.TemplatePlugin/MW5.TemplatePlugin.csproj
index 8b459be3..1d284f31 100644
--- a/src/Plugins/MW5.TemplatePlugin/MW5.TemplatePlugin.csproj
+++ b/src/Plugins/MW5.TemplatePlugin/MW5.TemplatePlugin.csproj
@@ -21,6 +21,7 @@
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <LangVersion>7.1</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <DefineConstants>TRACE</DefineConstants>
@@ -29,6 +30,7 @@
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <LangVersion>7.1</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
diff --git a/src/Plugins/MW5.Toolbox/MW5.Toolbox.csproj b/src/Plugins/MW5.Toolbox/MW5.Toolbox.csproj
index 3295fdaf..0c34011d 100644
--- a/src/Plugins/MW5.Toolbox/MW5.Toolbox.csproj
+++ b/src/Plugins/MW5.Toolbox/MW5.Toolbox.csproj
@@ -21,6 +21,7 @@
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <LangVersion>7.1</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <DefineConstants>TRACE</DefineConstants>
@@ -29,6 +30,7 @@
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <LangVersion>7.1</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
diff --git a/src/Utility/BindingListView.csproj b/src/Utility/BindingListView.csproj
index 10aa3c20..696d8428 100644
--- a/src/Utility/BindingListView.csproj
+++ b/src/Utility/BindingListView.csproj
@@ -37,6 +37,7 @@
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <Prefer32Bit>false</Prefer32Bit>
+    <LangVersion>7.1</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <OutputPath>bin\x86\Release\</OutputPath>
@@ -47,6 +48,7 @@
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <Prefer32Bit>false</Prefer32Bit>
+    <LangVersion>7.1</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
diff --git a/test/MW5.Api.Test/MW5.API.Test.csproj b/test/MW5.Api.Test/MW5.API.Test.csproj
index 48402352..cd9281d1 100644
--- a/test/MW5.Api.Test/MW5.API.Test.csproj
+++ b/test/MW5.Api.Test/MW5.API.Test.csproj
@@ -27,6 +27,7 @@
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <Prefer32Bit>false</Prefer32Bit>
+    <LangVersion>7.1</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <OutputPath>bin\x86\Release\</OutputPath>
@@ -37,6 +38,7 @@
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <Prefer32Bit>false</Prefer32Bit>
+    <LangVersion>7.1</LangVersion>
   </PropertyGroup>
   <PropertyGroup>
     <StartupObject />
diff --git a/test/MW5.Test/MW5.Test.csproj b/test/MW5.Test/MW5.Test.csproj
index b0d9e684..bf334fb9 100644
--- a/test/MW5.Test/MW5.Test.csproj
+++ b/test/MW5.Test/MW5.Test.csproj
@@ -26,6 +26,7 @@
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <LangVersion>7.1</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <OutputPath>bin\x86\Release\</OutputPath>
@@ -35,6 +36,7 @@
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <LangVersion>7.1</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
diff --git a/test/MW5.Tools.Test/MW5.Tools.Test.csproj b/test/MW5.Tools.Test/MW5.Tools.Test.csproj
index 9098f9ae..6e3df611 100644
--- a/test/MW5.Tools.Test/MW5.Tools.Test.csproj
+++ b/test/MW5.Tools.Test/MW5.Tools.Test.csproj
@@ -31,6 +31,7 @@
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <LangVersion>7.1</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <OutputPath>bin\x86\Release\</OutputPath>
@@ -40,6 +41,7 @@
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <LangVersion>7.1</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>

From 3283613e5c303a6118187d05b92c7acbfe99b6a4 Mon Sep 17 00:00:00 2001
From: Mathijs Dumon <mathijs.Dumon@gmail.com>
Date: Mon, 13 May 2019 09:44:17 +0200
Subject: [PATCH 05/15] MW5CORE-238 Adding ReloadFromSource method to
 IVectorLayer which preserves style and labels, and small fixes to persist
 layer styles after reloads and persisting/loading layer styles to/from
 spatial databases

---
 src/MW5.Api/Concrete/VectorLayer.cs           | 11 +++++++-
 src/MW5.Api/Interfaces/IVectorLayer.cs        |  1 +
 src/MW5/Controls/LegendPresenter.cs           | 26 ++++++++++++-------
 .../Services/LayerEditingService.cs           |  4 +--
 4 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/src/MW5.Api/Concrete/VectorLayer.cs b/src/MW5.Api/Concrete/VectorLayer.cs
index 55d9886d..396ab071 100644
--- a/src/MW5.Api/Concrete/VectorLayer.cs
+++ b/src/MW5.Api/Concrete/VectorLayer.cs
@@ -55,9 +55,18 @@ public VectorLayer(string filename, bool forUpdate = false)
             }
         }
 
-        public void ReloadFromSource()
+        public void ReloadFromSource(bool preserveStyleAndLabels = true)
         {
+            var lbls = Data.Labels.Style.Serialize();
+            var cats = Data.Categories.Serialize();
             _layer.ReloadFromSource();
+            Data.Labels.Deserialize(lbls);
+            Data.Categories.Deserialize(cats);
+        }
+
+        public void ReloadFromSource()
+        {
+            this.ReloadFromSource(true);
         }
 
         public bool Open(string filename, bool forUpdate = false)
diff --git a/src/MW5.Api/Interfaces/IVectorLayer.cs b/src/MW5.Api/Interfaces/IVectorLayer.cs
index e9dea497..22489c38 100644
--- a/src/MW5.Api/Interfaces/IVectorLayer.cs
+++ b/src/MW5.Api/Interfaces/IVectorLayer.cs
@@ -34,6 +34,7 @@ public interface IVectorLayer: ILayerSource
         bool Open(string connectionString, string layerName, bool forUpdate = false);
         bool OpenFromQuery(string connectionString, string sql);
         void ReloadFromSource();
+        void ReloadFromSource(bool preserveStyleAndLabels = true);
         IEnumerable<ComplexGeometryType> AvailableGeometryTypes {get;}
         void SetActiveGeometryType(GeometryType type, ZValueType zValue);
         GeometryType ActiveGeometryType { get; }
diff --git a/src/MW5/Controls/LegendPresenter.cs b/src/MW5/Controls/LegendPresenter.cs
index c214595c..43985300 100644
--- a/src/MW5/Controls/LegendPresenter.cs
+++ b/src/MW5/Controls/LegendPresenter.cs
@@ -148,12 +148,16 @@ public override void RunCommand(LegendCommand command)
                         if (layer != null)
                         {
                             if (!LayerSerializationHelper.CheckFilename(layer.Filename))
+                                LayerSerializationHelper.SaveSettings(layer);
+                            else
                             {
-                                MessageService.Current.Info("Can not save settings for a non-disk based layer.");
-                                return;
+                                if (!layer.SaveOptions("", true, ""))
+                                {
+                                    MessageService.Current.Info("Can not save settings for a non-disk based layer.");
+                                    return;
+                                }
                             }
-
-                            LayerSerializationHelper.SaveSettings(layer);
+                            
                         }
                         break;
                     }
@@ -163,13 +167,17 @@ public override void RunCommand(LegendCommand command)
 
                         if (layer != null)
                         {
-                            if (!LayerSerializationHelper.CheckFilename(layer.Filename))
+                            if (LayerSerializationHelper.CheckFilename(layer.Filename))
+                                LayerSerializationHelper.LoadSettings(layer, _broadcaster, false);
+                            else
                             {
-                                MessageService.Current.Info("Can not load settings for a non-disk based layer.");
-                                return;
+                                string desc="";
+                                if (!layer.LoadOptions("", ref desc))
+                                {
+                                    MessageService.Current.Info("Can not load settings for a non-disk based layer.");
+                                    return;
+                                }
                             }
-
-                            LayerSerializationHelper.LoadSettings(layer, _broadcaster, false);
                         }
                         
                         _context.Legend.Redraw(LegendRedraw.LegendAndMap);
diff --git a/src/Plugins/MW5.ShapeEditor/Services/LayerEditingService.cs b/src/Plugins/MW5.ShapeEditor/Services/LayerEditingService.cs
index 0a106d8e..b3a9b1fb 100644
--- a/src/Plugins/MW5.ShapeEditor/Services/LayerEditingService.cs
+++ b/src/Plugins/MW5.ShapeEditor/Services/LayerEditingService.cs
@@ -201,7 +201,7 @@ private bool SaveOgrLayer(VectorLayer ogrLayer)
                 MessageService.Current.Info(msg);
 
                 // reload from datasource to be sure that there is no stale data
-                ogrLayer.ReloadFromSource();
+                ogrLayer.ReloadFromSource(true);
             }
 
             return success;
@@ -224,7 +224,7 @@ private bool DiscardChangesCore(int layerHandle)
             
             if (ogrLayer != null)
             {
-                ogrLayer.ReloadFromSource();
+                ogrLayer.ReloadFromSource(true);
                 fs = ogrLayer.Data;
             }
             else

From e3518b1d38b14ac4698f34d5b957ffcf4d2ee93b Mon Sep 17 00:00:00 2001
From: Mathijs Dumon <mathijs.Dumon@gmail.com>
Date: Fri, 14 Dec 2018 12:39:38 +0100
Subject: [PATCH 06/15] MW5CORE-223 Added IsPartOfSet function on IFeature
 interface and implementation

---
 src/MW5.Api/Concrete/Feature.cs    | 5 +++++
 src/MW5.Api/Interfaces/IFeature.cs | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/MW5.Api/Concrete/Feature.cs b/src/MW5.Api/Concrete/Feature.cs
index 7e3dce46..7481a6dd 100644
--- a/src/MW5.Api/Concrete/Feature.cs
+++ b/src/MW5.Api/Concrete/Feature.cs
@@ -67,6 +67,11 @@ public int Index
             get { return _shapeIndex; }
         }
 
+        public bool IsPartOfSet(IFeatureSet set)
+        {
+            return set?.InternalObject == InternalShapefile;
+        }
+
         public IGeometry Geometry
         {
             get
diff --git a/src/MW5.Api/Interfaces/IFeature.cs b/src/MW5.Api/Interfaces/IFeature.cs
index 5d4afc8a..0c27f180 100644
--- a/src/MW5.Api/Interfaces/IFeature.cs
+++ b/src/MW5.Api/Interfaces/IFeature.cs
@@ -26,6 +26,7 @@ public interface IFeature
         bool SetInteger(int fieldIndex, int value);
         bool SetString(int fieldIndex, string value);
         IAttributeField GetField(int fieldIndex);
-        bool RowModified { get; } 
+        bool RowModified { get; }
+        bool IsPartOfSet(IFeatureSet featureSet);
     }
 }
\ No newline at end of file

From 7d037f8f066da35993dc819f6f839d26896263ec Mon Sep 17 00:00:00 2001
From: Mathijs Dumon <mathijs.Dumon@gmail.com>
Date: Mon, 13 May 2019 09:45:56 +0200
Subject: [PATCH 07/15] MW5CORE-231 Splash window now shows what plugins it is
 loading

---
 src/MW5.Plugins/PluginManager.cs           | 3 ++-
 src/MW5.Plugins/Services/IPluginManager.cs | 2 +-
 src/MW5/AppContext.cs                      | 4 ++--
 src/MW5/Forms/SplashView.Designer.cs       | 3 +++
 src/MW5/Views/MainPresenter.cs             | 3 ++-
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/MW5.Plugins/PluginManager.cs b/src/MW5.Plugins/PluginManager.cs
index cffe2bdd..e7f682ce 100644
--- a/src/MW5.Plugins/PluginManager.cs
+++ b/src/MW5.Plugins/PluginManager.cs
@@ -237,7 +237,7 @@ public void UnloadPlugin(PluginIdentity identity, IAppContext context)
             FirePluginUnloaded(identity);
         }
 
-        public void RestoreApplicationPlugins(IEnumerable<Guid> plugins, IAppContext context)
+        public void RestoreApplicationPlugins(IEnumerable<Guid> plugins, IAppContext context, Action<PluginIdentity> pluginLoadingCallback = null)
         {
             var dict = new HashSet<Guid>(plugins);
 
@@ -249,6 +249,7 @@ public void RestoreApplicationPlugins(IEnumerable<Guid> plugins, IAppContext con
 
                 if (active && !PluginActive(p.Identity))
                 {
+                    pluginLoadingCallback?.Invoke(p.Identity);
                     LoadPlugin(p.Identity, context);
                 }
             }
diff --git a/src/MW5.Plugins/Services/IPluginManager.cs b/src/MW5.Plugins/Services/IPluginManager.cs
index 03a43a67..6f831fc9 100644
--- a/src/MW5.Plugins/Services/IPluginManager.cs
+++ b/src/MW5.Plugins/Services/IPluginManager.cs
@@ -67,6 +67,6 @@ public interface IPluginManager
 
         bool PluginActive(PluginIdentity identity);
 
-        void RestoreApplicationPlugins(IEnumerable<Guid> plugins, IAppContext context);
+        void RestoreApplicationPlugins(IEnumerable<Guid> plugins, IAppContext context, Action<PluginIdentity> pluginLoadingCallback = null);
     }
 }
diff --git a/src/MW5/AppContext.cs b/src/MW5/AppContext.cs
index 7d987a11..94b4126f 100644
--- a/src/MW5/AppContext.cs
+++ b/src/MW5/AppContext.cs
@@ -223,7 +223,7 @@ internal void Init(
             Logger.Current.Trace("End AppContext.Init()");
         }
 
-        internal void InitPlugins(IConfigService configService)
+        internal void InitPlugins(IConfigService configService, Action<PluginIdentity> pluginLoadingCallback)
         {
             var pluginManager = PluginManager;
             pluginManager.PluginUnloaded += ManagerPluginUnloaded;
@@ -232,7 +232,7 @@ internal void InitPlugins(IConfigService configService)
             var guids = configService.Config.ApplicationPlugins;
             if (guids != null)
             {
-                PluginManager.RestoreApplicationPlugins(guids, this);
+                PluginManager.RestoreApplicationPlugins(guids, this, pluginLoadingCallback);
             }
         }
 
diff --git a/src/MW5/Forms/SplashView.Designer.cs b/src/MW5/Forms/SplashView.Designer.cs
index cd600a97..1dd0752a 100644
--- a/src/MW5/Forms/SplashView.Designer.cs
+++ b/src/MW5/Forms/SplashView.Designer.cs
@@ -66,6 +66,8 @@ private void InitializeComponent()
             // 
             // panel1
             // 
+            this.panel1.AutoSize = true;
+            this.panel1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
             this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.panel1.Controls.Add(this.pictureBox1);
             this.panel1.Controls.Add(this.lblVersion);
@@ -95,6 +97,7 @@ private void InitializeComponent()
             this.panel1.ResumeLayout(false);
             this.panel1.PerformLayout();
             this.ResumeLayout(false);
+            this.PerformLayout();
 
         }
 
diff --git a/src/MW5/Views/MainPresenter.cs b/src/MW5/Views/MainPresenter.cs
index 2890ea5f..9c39883a 100644
--- a/src/MW5/Views/MainPresenter.cs
+++ b/src/MW5/Views/MainPresenter.cs
@@ -100,7 +100,8 @@ public MainPresenter(
                 _menuUpdater = new MenuUpdater(_context, PluginIdentity.Default);
 
                 SplashView.Instance.ShowStatus("Loading plugins");
-                appContext.InitPlugins(configService); // must be called after docking is initialized
+                // must be called after docking is initialized:
+                appContext.InitPlugins(configService, p => SplashView.Instance.ShowStatus($"Loading plugins: {p.Name}"));
 
                 // this will display progress updates and debug window
                 // file based-logger is already working

From d10253ffc71c2b7ba080663b39f53b953b877ab7 Mon Sep 17 00:00:00 2001
From: Mathijs Dumon <mathijs.Dumon@gmail.com>
Date: Fri, 14 Dec 2018 13:02:08 +0100
Subject: [PATCH 08/15] MW5CORE-232 Made DockPanelKeys class public so plugins
 can locate core panels

---
 src/MW5.UI/Docking/DockPanelKeys.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/MW5.UI/Docking/DockPanelKeys.cs b/src/MW5.UI/Docking/DockPanelKeys.cs
index ce45ca20..b06847ea 100644
--- a/src/MW5.UI/Docking/DockPanelKeys.cs
+++ b/src/MW5.UI/Docking/DockPanelKeys.cs
@@ -6,7 +6,7 @@
 
 namespace MW5.UI.Docking
 {
-    internal class DockPanelKeys
+    public class DockPanelKeys
     {
         public const string Legend = "DockPanelLegend";
         public const string Preview = "DockPanelPreview";

From 7c47d5ca43916d3f60077121b6ccedb0ddb59083 Mon Sep 17 00:00:00 2001
From: Mathijs Dumon <mathijs.Dumon@gmail.com>
Date: Mon, 21 Jan 2019 09:15:34 +0100
Subject: [PATCH 09/15] MW5CORE-233 Fixing invalid temp file names for WMS,
 improving detection of image format

---
 src/MW5.Tiles/Helpers/BrutileHelper.cs        | 6 +++---
 src/MW5.Tiles/Helpers/WmsCapabilitiesCache.cs | 2 +-
 src/MW5.Tiles/MW5.Tiles.csproj                | 5 ++---
 src/MW5.Tiles/packages.config                 | 2 +-
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/MW5.Tiles/Helpers/BrutileHelper.cs b/src/MW5.Tiles/Helpers/BrutileHelper.cs
index b7dd5855..777dde9a 100644
--- a/src/MW5.Tiles/Helpers/BrutileHelper.cs
+++ b/src/MW5.Tiles/Helpers/BrutileHelper.cs
@@ -54,7 +54,8 @@ public static WmsSource CreateWmsLayer(this WmsCapabilities capabilities, IEnume
                 return null;
             }
 
-            var box = layer.ChooseBoundingBox(mapProjection);
+            // First try the layer, as a fallback, use the bounding box defined in the capabilities
+            var box = layer.ChooseBoundingBox(mapProjection) ?? capabilities.Capability.Layer.ChooseBoundingBox(mapProjection);
             if (box == null)
             {
                 MessageService.Current.Info("Failed to determine bounds of the layer.");
@@ -82,8 +83,7 @@ public static WmsSource CreateWmsLayer(this WmsCapabilities capabilities, IEnume
 
         private static string GetFormat(this WmsCapabilities capabilities)
         {
-            var list = capabilities.Capability.Request.GetMap.Format;
-            return list.Count > 2 ? list[2] : list.FirstOrDefault();
+            return capabilities.Capability.Request.GetMap.Format.DefaultIfEmpty("image/png").FirstOrDefault();
         }
 
         private static string GetLayers(this IEnumerable<Layer> layers)
diff --git a/src/MW5.Tiles/Helpers/WmsCapabilitiesCache.cs b/src/MW5.Tiles/Helpers/WmsCapabilitiesCache.cs
index 5b8af5cf..0c712d68 100644
--- a/src/MW5.Tiles/Helpers/WmsCapabilitiesCache.cs
+++ b/src/MW5.Tiles/Helpers/WmsCapabilitiesCache.cs
@@ -17,7 +17,7 @@ internal static class WmsCapabilitiesCache
     {
         private static string GetXmlPath(string url)
         {
-            url = url.Replace('/', '_').Replace(':', '_');
+            url = System.Uri.UnescapeDataString(url.Replace('/', '_').Replace(':', '_').Replace('?', '_'));
             return ConfigPathHelper.GetWmsCachePath() + url + ".xml";
         }
 
diff --git a/src/MW5.Tiles/MW5.Tiles.csproj b/src/MW5.Tiles/MW5.Tiles.csproj
index 429e4afb..f4abae66 100644
--- a/src/MW5.Tiles/MW5.Tiles.csproj
+++ b/src/MW5.Tiles/MW5.Tiles.csproj
@@ -54,9 +54,8 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="BruTile, Version=0.22.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\BruTile.0.22.1\lib\portable-net45+win+WindowsPhoneApp81+Xamarin.iOS10+MonoAndroid10+MonoTouch10\BruTile.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="BruTile, Version=2.0.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\BruTile.2.0.2\lib\net45\BruTile.dll</HintPath>
     </Reference>
     <Reference Include="EnvDTE, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
       <EmbedInteropTypes>True</EmbedInteropTypes>
diff --git a/src/MW5.Tiles/packages.config b/src/MW5.Tiles/packages.config
index 25b797a1..4514e472 100644
--- a/src/MW5.Tiles/packages.config
+++ b/src/MW5.Tiles/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="BruTile" version="0.22.1" targetFramework="net46" />
+  <package id="BruTile" version="2.0.2" targetFramework="net46" />
   <package id="SQLite.Net.Core-PCL" version="3.1.1" targetFramework="net45" />
   <package id="SQLite.Net-PCL" version="3.1.1" targetFramework="net45" />
 </packages>
\ No newline at end of file

From 24e107bf7c19bee8ce4ce3abb6874ee7390c377d Mon Sep 17 00:00:00 2001
From: Mathijs Dumon <mathijs.Dumon@gmail.com>
Date: Thu, 9 May 2019 12:07:02 +0200
Subject: [PATCH 10/15] MW5CORE-220 Exposing selectable property to FeatureSet

---
 src/MW5.Api/Concrete/FeatureSet.cs    | 2 ++
 src/MW5.Api/Interfaces/IFeatureSet.cs | 1 +
 2 files changed, 3 insertions(+)

diff --git a/src/MW5.Api/Concrete/FeatureSet.cs b/src/MW5.Api/Concrete/FeatureSet.cs
index 36897d5c..562f7b9c 100644
--- a/src/MW5.Api/Concrete/FeatureSet.cs
+++ b/src/MW5.Api/Concrete/FeatureSet.cs
@@ -213,6 +213,8 @@ public static void DeleteShapefile(string filename)
 
         public GeometryType GeometryType => GeometryHelper.ShapeType2GeometryType(_shapefile.ShapefileType);
 
+        public bool Selectable { get => _shapefile.Selectable; set => _shapefile.Selectable = value; }
+
         public ZValueType ZValueType => GeometryHelper.ShapeType2ZValueType(_shapefile.ShapefileType);
 
         public FeatureSourceType SourceType => (FeatureSourceType)_shapefile.SourceType;
diff --git a/src/MW5.Api/Interfaces/IFeatureSet.cs b/src/MW5.Api/Interfaces/IFeatureSet.cs
index 2c9dfc83..cbec4081 100644
--- a/src/MW5.Api/Interfaces/IFeatureSet.cs
+++ b/src/MW5.Api/Interfaces/IFeatureSet.cs
@@ -40,6 +40,7 @@ public interface IFeatureSet: ILayerSource
 
         CollisionMode CollisionMode { get; set; }
         bool Snappable { get; set; }
+        bool Selectable { get; set; }
         bool Volatile { get; set; }
         bool Identifiable { get; set; }
         string VisibilityExpression { get; set; }

From fe3aeb5744f1ff1ee65760f87b808f80009f05bc Mon Sep 17 00:00:00 2001
From: Mathijs Dumon <mathijs.Dumon@gmail.com>
Date: Mon, 21 Jan 2019 09:19:58 +0100
Subject: [PATCH 11/15] MW5CORE-234 Small improvements to installer script.
 Adding install location reg key.

---
 install/MapWindow5.iss | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/install/MapWindow5.iss b/install/MapWindow5.iss
index 62d0ddf6..7f355cdf 100644
--- a/install/MapWindow5.iss
+++ b/install/MapWindow5.iss
@@ -93,7 +93,7 @@ Source: "{#ExeBinPath}\Projections\*"; DestDir: "{app}\Projections"; Flags: igno
 ;; Manuals sub folder
 Source: "{#ExeBinPath}\Manuals\*"; DestDir: "{app}\Manuals"; Flags: ignoreversion recursesubdirs createallsubdirs {#SystemFlag}; Components: MapWindow
 ;; Plugins subfolder
-Source: "{#ExeBinPath}\Plugins\*.dll"; DestDir: "{app}\Plugins"; Flags: ignoreversion {#SystemFlag}; Components: MapWindow; Excludes: "Interop.MapWinGIS.dll,MW5.TemplatePlugin.dll,Syncfusion.*"
+Source: "{#ExeBinPath}\Plugins\*"; DestDir: "{app}\Plugins"; Flags: ignoreversion recursesubdirs createallsubdirs {#SystemFlag}; Components: MapWindow; Excludes: "Interop.MapWinGIS.dll,MW5.TemplatePlugin.dll,Syncfusion.*"
 ;; Styles subfolder
 Source: "{#ExeBinPath}\Styles\*"; DestDir: "{app}\Styles"; Flags: ignoreversion recursesubdirs createallsubdirs {#SystemFlag}; Components: MapWindow
 ;; SQLite interop:
@@ -154,6 +154,7 @@ Root: "HKCR"; Subkey: ".mwproj"; ValueType: string; ValueData: "MW5Project"; Fla
 Root: "HKCR"; Subkey: "MW5Project"; ValueType: string; ValueData: "MW5 Project"; Flags: uninsdeletekey
 Root: "HKCR"; Subkey: "MW5Project\DefaultIcon"; ValueType: string; ValueData: "{app}\MAPWINDOW.EXE,0"
 Root: "HKCR"; Subkey: "MW5Project\shell\open\command"; ValueType: string; ValueData: """{app}\MAPWINDOW.EXE"" ""%1"""
+Root: "HKCR"; Subkey: "MW5Project\"; ValueName: "InstallDir"; ValueType: string; ValueData: "{app}"
 
 [InstallDelete]
 Type: files; Name: "{app}\Plugins\MW5.TemplatePlugin.dll"; Components: MapWindow

From 2a699bb2e8a791d1322132191a51df59720b3d4f Mon Sep 17 00:00:00 2001
From: Mathijs Dumon <mathijs.Dumon@gmail.com>
Date: Thu, 9 May 2019 12:27:52 +0200
Subject: [PATCH 12/15] MW5CORE-235 Adding a replace shape method to the
 GeoProcessingService - which also fires shape edit events

---
 src/MW5.Api/Events/AfterShapeEditEventArgs.cs |  6 ++++++
 src/MW5.Plugins/PluginBroadcaster.cs          |  2 --
 .../Services/IGeoprocessingService.cs         |  6 +++++-
 .../Services/GeoprocessingService.cs          | 19 +++++++++++++++++++
 4 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/src/MW5.Api/Events/AfterShapeEditEventArgs.cs b/src/MW5.Api/Events/AfterShapeEditEventArgs.cs
index 5e5da166..4af31313 100644
--- a/src/MW5.Api/Events/AfterShapeEditEventArgs.cs
+++ b/src/MW5.Api/Events/AfterShapeEditEventArgs.cs
@@ -1,5 +1,6 @@
 using System;
 using AxMapWinGIS;
+using MapWinGIS;
 using MW5.Api.Enums;
 
 namespace MW5.Api.Events
@@ -8,6 +9,11 @@ public class AfterShapeEditEventArgs: EventArgs
     {
         private readonly _DMapEvents_AfterShapeEditEvent _args;
 
+        public AfterShapeEditEventArgs(UndoOperation operation, int layerHandle, int shapeIndex)
+            : this(new _DMapEvents_AfterShapeEditEvent((tkUndoOperation)operation, layerHandle, shapeIndex))
+        {
+        }
+
         internal AfterShapeEditEventArgs(_DMapEvents_AfterShapeEditEvent args)
         {
             _args = args;
diff --git a/src/MW5.Plugins/PluginBroadcaster.cs b/src/MW5.Plugins/PluginBroadcaster.cs
index 7c1cbd6f..c2ff959b 100644
--- a/src/MW5.Plugins/PluginBroadcaster.cs
+++ b/src/MW5.Plugins/PluginBroadcaster.cs
@@ -104,8 +104,6 @@ private void BroadcastEvent<T>(MemberExpression expression, object sender, T arg
             
             string eventName = expression.Member.Name;
 
-            var singleTargetArgs = args as SingleTargetEventArgs;
-
             bool IsCancelled() => (
                 (args is ICancellableEvent bargs && bargs.Cancel) ||
                 (args is CancelEventArgs cargs && cargs.Cancel)
diff --git a/src/MW5.Plugins/Services/IGeoprocessingService.cs b/src/MW5.Plugins/Services/IGeoprocessingService.cs
index 953660dd..d932e081 100644
--- a/src/MW5.Plugins/Services/IGeoprocessingService.cs
+++ b/src/MW5.Plugins/Services/IGeoprocessingService.cs
@@ -1,4 +1,6 @@
-namespace MW5.Plugins.Services
+using MW5.Api.Interfaces;
+
+namespace MW5.Plugins.Services
 {
     public interface IGeoprocessingService
     {
@@ -23,5 +25,7 @@ public interface IGeoprocessingService
         void CopyShapes();
         void PasteShapes();
         void CutShapes();
+
+        void ReplaceShape(int layerHandle, int shapeIndex, IGeometry newGeometry);
     }
 }
diff --git a/src/Plugins/MW5.ShapeEditor/Services/GeoprocessingService.cs b/src/Plugins/MW5.ShapeEditor/Services/GeoprocessingService.cs
index dcebf4f1..e6822bbf 100644
--- a/src/Plugins/MW5.ShapeEditor/Services/GeoprocessingService.cs
+++ b/src/Plugins/MW5.ShapeEditor/Services/GeoprocessingService.cs
@@ -125,6 +125,25 @@ public void CutShapes()
             }
         }
 
+        public void ReplaceShape(int layerHandle, int shapeIndex, IGeometry newGeometry)
+        {
+            var layer = _context.Layers.GetVectorLayer(layerHandle);
+            if (layer == null)
+            {
+                MessageService.Current.Info("Layer with specified handle not found.");
+                return;
+            }
+
+            BeforeShapeEditEventArgs beforeargs = new BeforeShapeEditEventArgs(layerHandle, shapeIndex, false);
+            _broadcaster.BroadcastEvent(p => p.BeforeShapeEdit_, _context.Map, beforeargs);
+            
+            _context.Map.History.Add(UndoOperation.EditShape, layerHandle, shapeIndex);
+            layer.Data.Features.EditUpdate(shapeIndex, newGeometry);
+
+            AfterShapeEditEventArgs afterargs = new AfterShapeEditEventArgs(UndoOperation.EditShape, layerHandle, shapeIndex);
+            _broadcaster.BroadcastEvent(p => p.AfterShapeEdit_, _context.Map, afterargs);
+        }
+
         /// <summary>
         /// Removes selected shapes
         /// </summary>

From 4e6cf3ff32b871c24a1f222228f9a2e04b088891 Mon Sep 17 00:00:00 2001
From: Mathijs Dumon <mathijs.Dumon@gmail.com>
Date: Thu, 9 May 2019 12:42:32 +0200
Subject: [PATCH 13/15] MW5CORE-237 Adding layer removed events when a group is
 removed from the legend

---
 src/MW5/Controls/LegendPresenter.cs | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/MW5/Controls/LegendPresenter.cs b/src/MW5/Controls/LegendPresenter.cs
index 43985300..68403bdb 100644
--- a/src/MW5/Controls/LegendPresenter.cs
+++ b/src/MW5/Controls/LegendPresenter.cs
@@ -105,7 +105,18 @@ public override void RunCommand(LegendCommand command)
                         var group = Legend.Groups.ItemByHandle(_legendDockPanel.SelectedGroupHandle);
                         if (group != null)
                         {
-                            if (MessageService.Current.Ask("Do you want to remove group: " + group.Text + "?"))
+                            var cancel = false;
+                            foreach (var layer in group.Layers)
+                            {
+                                var args = new Plugins.Events.LayerCancelEventArgs(layer.Handle);
+                                _broadcaster.BroadcastEvent(p => p.BeforeRemoveLayer_, Legend, args);
+                                if (args.Cancel)
+                                {
+                                    cancel = true;
+                                    break;
+                                }
+                            }
+                            if (!cancel && MessageService.Current.Ask("Do you want to remove group: " + group.Text + "?"))
                             {
                                 Legend.Groups.Remove(group.Handle);
                             }

From 144d03dfa4cc3cd791dde6352e1e029061388fbc Mon Sep 17 00:00:00 2001
From: Mathijs Dumon <mathijs.Dumon@gmail.com>
Date: Thu, 9 May 2019 12:15:30 +0200
Subject: [PATCH 14/15] Adding missing MapWinGIS methods, attributes & events

---
 src/MW5.Api/Concrete/Layer.cs                 |  5 +++
 .../Events/BeforeVertexDigitizedEventArgs.cs  | 40 +++++++++++++++++++
 src/MW5.Api/Interfaces/ILayer.cs              |  2 +
 src/MW5.Api/Interfaces/IMap.cs                |  1 +
 src/MW5.Api/MW5.Api.csproj                    | 17 ++++----
 src/MW5.Api/Map/MapControl.cs                 |  1 +
 src/MW5.Api/Map/MapEvents.cs                  |  6 +++
 7 files changed, 64 insertions(+), 8 deletions(-)
 create mode 100644 src/MW5.Api/Events/BeforeVertexDigitizedEventArgs.cs

diff --git a/src/MW5.Api/Concrete/Layer.cs b/src/MW5.Api/Concrete/Layer.cs
index d4fc4245..8c88d49f 100644
--- a/src/MW5.Api/Concrete/Layer.cs
+++ b/src/MW5.Api/Concrete/Layer.cs
@@ -264,6 +264,11 @@ public bool Deserialize(string state)
             return Map.DeserializeLayer(LayerHandle, state);
         }
 
+        public void ReloadOgrLayerFromSource()
+        {
+            Map.ReloadOgrLayerFromSource(LayerHandle);
+        }
+
         /// <summary>
         /// Changes selection of the shapefile adding new shapes using the specified mode
         /// </summary>
diff --git a/src/MW5.Api/Events/BeforeVertexDigitizedEventArgs.cs b/src/MW5.Api/Events/BeforeVertexDigitizedEventArgs.cs
new file mode 100644
index 00000000..46beb45a
--- /dev/null
+++ b/src/MW5.Api/Events/BeforeVertexDigitizedEventArgs.cs
@@ -0,0 +1,40 @@
+using AxMapWinGIS;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MW5.Api.Events
+{
+    public class BeforeVertexDigitizedEventArgs : EventArgs
+    {
+        private readonly _DMapEvents_BeforeVertexDigitizedEvent _args;
+
+        public BeforeVertexDigitizedEventArgs(double pointX, double pointY)
+            : this(new _DMapEvents_BeforeVertexDigitizedEvent(pointX, pointY))
+        {
+        }
+
+        internal BeforeVertexDigitizedEventArgs(_DMapEvents_BeforeVertexDigitizedEvent args)
+        {
+            _args = args;
+            if (args == null)
+            {
+                throw new NullReferenceException("Internal reference is null.");
+            }
+        }
+
+        public double PointX
+        {
+            get { return _args.pointX; }
+            set { _args.pointX = value; }
+        }
+
+        public double PointY
+        {
+            get { return _args.pointY; }
+            set { _args.pointY = value; }
+        }
+    }
+}
diff --git a/src/MW5.Api/Interfaces/ILayer.cs b/src/MW5.Api/Interfaces/ILayer.cs
index a7d6b537..e4939a77 100644
--- a/src/MW5.Api/Interfaces/ILayer.cs
+++ b/src/MW5.Api/Interfaces/ILayer.cs
@@ -44,6 +44,8 @@ public interface ILayer: IDynamicVisibilityTarget
 
         string SizeInfo { get; }
 
+        void ReloadOgrLayerFromSource();
+
         #region Not implemented
 
         // bool SkipOnSaving { get; set; }
diff --git a/src/MW5.Api/Interfaces/IMap.cs b/src/MW5.Api/Interfaces/IMap.cs
index 186a9dca..985ab9e7 100644
--- a/src/MW5.Api/Interfaces/IMap.cs
+++ b/src/MW5.Api/Interfaces/IMap.cs
@@ -12,6 +12,7 @@ public interface IMap : IMuteMap
     {
         event EventHandler<EventArgs> MapCursorChanged;
         event EventHandler<AfterShapeEditEventArgs> AfterShapeEdit;
+        event EventHandler<BeforeVertexDigitizedEventArgs> BeforeVertexDigitized;
         event EventHandler<BackgroundLoadingFinishedEventArgs> BackgroundLoadingFinished;
         event EventHandler<BackgroundLoadingStartedEventArgs> BackgroundLoadingStarted;
         event EventHandler<BeforeDeleteShapeEventArgs> BeforeDeleteShape;
diff --git a/src/MW5.Api/MW5.Api.csproj b/src/MW5.Api/MW5.Api.csproj
index 8554f37c..fcbc1e63 100644
--- a/src/MW5.Api/MW5.Api.csproj
+++ b/src/MW5.Api/MW5.Api.csproj
@@ -91,6 +91,7 @@
     <Compile Include="Concrete\ImageBandCollection.cs" />
     <Compile Include="Concrete\RasterHistogram.cs" />
     <Compile Include="Concrete\WmsSource.cs" />
+    <Compile Include="Events\BeforeVertexDigitizedEventArgs.cs" />
     <Compile Include="Interfaces\ICancellableEvent.cs" />
     <Compile Include="Events\LockedEventArgs.cs" />
     <Compile Include="Events\UpdateJoinEventArgs.cs" />
@@ -309,8 +310,8 @@
   <ItemGroup Condition="'$(Configuration)' == 'Release'">
     <COMReference Include="AxMapWinGIS">
       <Guid>{C368D713-CC5F-40ED-9F53-F84FE197B96A}</Guid>
-      <VersionMajor>4</VersionMajor>
-      <VersionMinor>9</VersionMinor>
+      <VersionMajor>5</VersionMajor>
+      <VersionMinor>0</VersionMinor>
       <Lcid>0</Lcid>
       <WrapperTool>aximp</WrapperTool>
       <Isolated>True</Isolated>
@@ -318,8 +319,8 @@
     </COMReference>
     <COMReference Include="MapWinGIS">
       <Guid>{C368D713-CC5F-40ED-9F53-F84FE197B96A}</Guid>
-      <VersionMajor>4</VersionMajor>
-      <VersionMinor>9</VersionMinor>
+      <VersionMajor>5</VersionMajor>
+      <VersionMinor>0</VersionMinor>
       <Lcid>0</Lcid>
       <WrapperTool>tlbimp</WrapperTool>
       <Isolated>True</Isolated>
@@ -330,8 +331,8 @@
   <ItemGroup Condition="'$(Configuration)' == 'Debug'">
     <COMReference Include="AxMapWinGIS">
       <Guid>{C368D713-CC5F-40ED-9F53-F84FE197B96A}</Guid>
-      <VersionMajor>4</VersionMajor>
-      <VersionMinor>9</VersionMinor>
+      <VersionMajor>5</VersionMajor>
+      <VersionMinor>0</VersionMinor>
       <Lcid>0</Lcid>
       <WrapperTool>aximp</WrapperTool>
       <Isolated>False</Isolated>
@@ -339,8 +340,8 @@
     </COMReference>
     <COMReference Include="MapWinGIS">
       <Guid>{C368D713-CC5F-40ED-9F53-F84FE197B96A}</Guid>
-      <VersionMajor>4</VersionMajor>
-      <VersionMinor>9</VersionMinor>
+      <VersionMajor>5</VersionMajor>
+      <VersionMinor>0</VersionMinor>
       <Lcid>0</Lcid>
       <WrapperTool>tlbimp</WrapperTool>
       <Isolated>False</Isolated>
diff --git a/src/MW5.Api/Map/MapControl.cs b/src/MW5.Api/Map/MapControl.cs
index 92b541ea..acc86bcf 100644
--- a/src/MW5.Api/Map/MapControl.cs
+++ b/src/MW5.Api/Map/MapControl.cs
@@ -86,6 +86,7 @@ private void OnMapPreviewKeyDown(object sender, PreviewKeyDownEventArgs e)
         public event EventHandler<TilesLoadedEventArgs> TilesLoaded;
         public event EventHandler<EventArgs> HistoryChanged;
         public event EventHandler<ValidateShapeEventArgs> ValidateShape;
+        public event EventHandler<BeforeVertexDigitizedEventArgs> BeforeVertexDigitized;
         public event EventHandler<LockedEventArgs> MapLocked;
         public event EventHandler<EventArgs> TmsProviderChanged;
 
diff --git a/src/MW5.Api/Map/MapEvents.cs b/src/MW5.Api/Map/MapEvents.cs
index 41b4e5d1..a3e37ac1 100644
--- a/src/MW5.Api/Map/MapEvents.cs
+++ b/src/MW5.Api/Map/MapEvents.cs
@@ -38,6 +38,7 @@ public void AttachHandlers()
             _map.TilesLoaded += MapTilesLoaded;
             _map.UndoListChanged += MapUndoListChanged;
             _map.ValidateShape += MapValidateShape;
+            _map.BeforeVertexDigitized += MapBeforeVertexDigitized;
         }
 
         public void DetachHandlers()
@@ -68,9 +69,14 @@ public void DetachHandlers()
             _map.TilesLoaded -= MapTilesLoaded;
             _map.UndoListChanged -= MapUndoListChanged;
             _map.ValidateShape -= MapValidateShape;
+            _map.BeforeVertexDigitized -= MapBeforeVertexDigitized;
         }
 
         #region Handlers
+        private void MapBeforeVertexDigitized(object sender, _DMapEvents_BeforeVertexDigitizedEvent e)
+        {
+            Invoke(sender, BeforeVertexDigitized, new BeforeVertexDigitizedEventArgs(e));
+        }
 
         private void MapValidateShape(object sender, _DMapEvents_ValidateShapeEvent e)
         {

From 89ac8cca05b3a2dab1ddf7855e237ae6d85c4cda Mon Sep 17 00:00:00 2001
From: Mathijs Dumon <mathijs.Dumon@gmail.com>
Date: Mon, 13 May 2019 09:45:12 +0200
Subject: [PATCH 15/15] Switch MW.API to VS2017

---
 src/MW5.sln | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/MW5.sln b/src/MW5.sln
index c57f24bc..e02dbb5c 100644
--- a/src/MW5.sln
+++ b/src/MW5.sln
@@ -1,7 +1,6 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+VisualStudioVersion = 15.0.28010.2026
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MW5.Api", "MW5.Api\MW5.Api.csproj", "{8AAD34B3-8EF3-485F-A04D-ED2C07D8F1DF}"
 EndProject