Adding segment/vertex snapping options to the shape editor

.gitignore

@@ -5,6 +5,7 @@
 *.suo
 *.user
 *.sln.docstates
+.vs/
 
 # Build results
 

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:
@@ -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
@@ -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

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

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;

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; }

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>

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)

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,

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;

src/MW5.Api/Events/BeforeDeleteShapeEventArgs.cs

@@ -2,13 +2,22 @@
 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;
 
+        public BeforeDeleteShapeEventArgs(DeleteTarget target, bool cancel)
+        {
+            _args = new _DMapEvents_BeforeDeleteShapeEvent(
+                (tkDeleteTarget) target,
+                cancel ? tkMwBoolean.blnTrue : tkMwBoolean.blnFalse
+            );
+        }
+
         internal BeforeDeleteShapeEventArgs(_DMapEvents_BeforeDeleteShapeEvent args)
         {
             _args = args;

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;
 
@@ -17,6 +18,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; }

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; }
+        }
+    }
+}

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;
     }
 }

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; }

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

src/MW5.Api/Interfaces/ICancellableEvent.cs

@@ -0,0 +1,7 @@
+namespace MW5.Api.Interfaces
+{
+    public interface ICancellableEvent
+    {
+        bool Cancel { get; }
+    }
+}

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);
     }
 }

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; }

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; }

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; }

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;

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; }

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)
         {

src/MW5.Api/Legend/Events/LayerCancelEventArgs.cs

@@ -1,12 +1,13 @@
-using System;
+using MW5.Api.Interfaces;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
 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; }