Index: Core/Gui/src/Core.Gui/Core.Gui.csproj =================================================================== diff -u -r434415295de74c310ce6d3cdd0100c28838cf9ea -r01cc95a0e9b04cbd3560c8f24be0641a31321b48 --- Core/Gui/src/Core.Gui/Core.Gui.csproj (.../Core.Gui.csproj) (revision 434415295de74c310ce6d3cdd0100c28838cf9ea) +++ Core/Gui/src/Core.Gui/Core.Gui.csproj (.../Core.Gui.csproj) (revision 01cc95a0e9b04cbd3560c8f24be0641a31321b48) @@ -120,6 +120,9 @@ UserControl + + UserControl + @@ -132,6 +135,8 @@ + + Index: Core/Gui/src/Core.Gui/Forms/Map/MapLegendView.Designer.cs =================================================================== diff -u --- Core/Gui/src/Core.Gui/Forms/Map/MapLegendView.Designer.cs (revision 0) +++ Core/Gui/src/Core.Gui/Forms/Map/MapLegendView.Designer.cs (revision 01cc95a0e9b04cbd3560c8f24be0641a31321b48) @@ -0,0 +1,78 @@ +// Copyright (C) Stichting Deltares 2021. All rights reserved. +// +// This file is part of Riskeer. +// +// Riskeer is free software: you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +namespace Core.Gui.Forms.Map +{ + partial class MapLegendView + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Component Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.treeViewControl = new Core.Common.Controls.TreeView.TreeViewControl(); + this.SuspendLayout(); + // + // treeViewControl + // + this.treeViewControl.Data = null; + this.treeViewControl.Dock = System.Windows.Forms.DockStyle.Fill; + this.treeViewControl.Location = new System.Drawing.Point(0, 0); + this.treeViewControl.Name = "treeViewControl"; + this.treeViewControl.Size = new System.Drawing.Size(150, 150); + this.treeViewControl.TabIndex = 0; + // + // MapLegendView + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.treeViewControl); + this.Name = "MapLegendView"; + this.ResumeLayout(false); + + } + + #endregion + + private Common.Controls.TreeView.TreeViewControl treeViewControl; + } +} Index: Core/Gui/src/Core.Gui/Forms/Map/MapLegendView.cs =================================================================== diff -u --- Core/Gui/src/Core.Gui/Forms/Map/MapLegendView.cs (revision 0) +++ Core/Gui/src/Core.Gui/Forms/Map/MapLegendView.cs (revision 01cc95a0e9b04cbd3560c8f24be0641a31321b48) @@ -0,0 +1,436 @@ +// Copyright (C) Stichting Deltares 2021. All rights reserved. +// +// This file is part of Riskeer. +// +// Riskeer is free software: you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +using System; +using System.Collections.Generic; +using System.Drawing; +using System.Linq; +using System.Windows.Forms; +using Core.Common.Controls.TreeView; +using Core.Common.Controls.Views; +using Core.Components.Gis.Data; +using Core.Components.Gis.Data.Removable; +using Core.Components.Gis.Forms; +using Core.Components.Gis.Helpers; +using Core.Gui.ContextMenu; +using Core.Gui.Helpers; +using Core.Gui.PresentationObjects.Map; +using GuiResources = Core.Gui.Properties.Resources; + +namespace Core.Gui.Forms.Map +{ + /// + /// The view which shows the data that is added to a . + /// + public sealed partial class MapLegendView : UserControl, ISelectionProvider, IView + { + private readonly IContextMenuBuilderProvider contextMenuBuilderProvider; + + private IMapControl mapControl; + + public event EventHandler SelectionChanged; + + /// + /// Creates a new instance of . + /// + /// The to create context menus. + /// Thrown when is null. + public MapLegendView(IContextMenuBuilderProvider contextMenuBuilderProvider) + { + if (contextMenuBuilderProvider == null) + { + throw new ArgumentNullException(nameof(contextMenuBuilderProvider), + $@"Cannot create a {typeof(MapLegendView).Name} when the context menu builder provider is null."); + } + + this.contextMenuBuilderProvider = contextMenuBuilderProvider; + InitializeComponent(); + Text = MapResources.General_Map; + + RegisterTreeNodeInfos(); + + treeViewControl.SelectedDataChanged += TreeViewControlSelectedDataChanged; + } + + /// + /// Gets or sets the for which this legend view is configured + /// to show the internal map data for. + /// + public IMapControl MapControl + { + private get + { + return mapControl; + } + set + { + mapControl = value; + Data = value?.Data; + } + } + + public object Selection + { + get + { + return treeViewControl.SelectedData; + } + } + + public object Data + { + get + { + return (MapDataCollectionContext) treeViewControl.Data; + } + set + { + treeViewControl.Data = value != null + ? new MapDataCollectionContext((MapDataCollection) value, null) + : null; + } + } + + private void TreeViewControlSelectedDataChanged(object sender, EventArgs e) + { + SelectionChanged?.Invoke(this, new EventArgs()); + } + + private void RegisterTreeNodeInfos() + { + treeViewControl.RegisterTreeNodeInfo(new TreeNodeInfo + { + Text = context => context.WrappedData.Name, + Image = GetImage, + CanDrag = (context, parent) => true, + CanCheck = context => true, + CheckedState = context => context.WrappedData.IsVisible ? TreeNodeCheckedState.Checked : TreeNodeCheckedState.Unchecked, + OnNodeChecked = FeatureBasedMapDataContextOnNodeChecked, + CanRemove = (context, parent) => CanRemoveMapData((FeatureBasedMapData) context.WrappedData, parent), + OnNodeRemoved = (context, parent) => RemoveFromParent((FeatureBasedMapData) context.WrappedData, parent), + ContextMenuStrip = FeatureBasedMapDataContextContextMenuStrip + }); + + treeViewControl.RegisterTreeNodeInfo(new TreeNodeInfo + { + Text = context => context.WrappedData.Name, + Image = context => GuiResources.folder, + ChildNodeObjects = GetCollectionChildNodeObjects, + CanDrag = (context, parentData) => context.ParentMapData != null, + CanCheck = context => true, + CheckedState = MapDataCollectionContextCheckedState, + OnNodeChecked = MapDataCollectionContextOnNodeChecked, + CanDrop = MapDataCollectionCanDropAndInsert, + CanInsert = MapDataCollectionCanDropAndInsert, + OnDrop = MapDataCollectionOnDrop, + ContextMenuStrip = MapDataCollectionContextMenuStrip + }); + } + + private StrictContextMenuItem CreateZoomToExtentsItem(MapDataContext context) + { + StrictContextMenuItem zoomToExtentsItem = null; + + if (context is MapDataCollectionContext) + { + zoomToExtentsItem = CreateZoomToExtentsItem((MapDataCollection) context.WrappedData); + } + + if (context is FeatureBasedMapDataContext) + { + zoomToExtentsItem = CreateZoomToExtentsItem((FeatureBasedMapData) context.WrappedData); + } + + return zoomToExtentsItem; + } + + #region MapData + + private StrictContextMenuItem CreateZoomToExtentsItem(FeatureBasedMapData nodeData) + { + bool hasFeatures = nodeData.Features.Any(); + bool enabled = nodeData.IsVisible && hasFeatures; + string toolTip; + + if (nodeData.IsVisible) + { + toolTip = hasFeatures + ? MapResources.MapLegendView_CreateZoomToExtentsItem_ZoomToAll_Tooltip + : MapResources.MapLegendView_CreateZoomToExtentsItem_NoFeatures_ZoomToAllDisabled_Tooltip; + } + else + { + toolTip = MapResources.MapLegendView_CreateZoomToExtentsItem_ZoomToAllDisabled_Tooltip; + } + + return CreateZoomToExtentsItem(nodeData, toolTip, enabled); + } + + private StrictContextMenuItem CreateZoomToExtentsItem(MapDataCollection nodeData) + { + FeatureBasedMapData[] featureBasedMapDatas = nodeData.GetFeatureBasedMapDataRecursively().ToArray(); + var isVisible = false; + var hasFeatures = false; + foreach (FeatureBasedMapData mapData in featureBasedMapDatas) + { + if (mapData.IsVisible) + { + isVisible = true; + + if (mapData.Features.Any()) + { + hasFeatures = true; + break; + } + } + } + + bool enabled = isVisible && hasFeatures; + + string toolTip; + + if (isVisible) + { + toolTip = hasFeatures + ? MapResources.MapLegendView_CreateZoomToExtentsItem_MapDataCollection_ZoomToAll_Tooltip + : MapResources.MapLegendView_CreateZoomToExtentsItem_MapDataCollection_NoFeatures_ZoomToAllDisabled_Tooltip; + } + else + { + toolTip = MapResources.MapLegendView_CreateZoomToExtentsItem_MapDataCollection_ZoomToAllDisabled_Tooltip; + } + + return CreateZoomToExtentsItem(nodeData, toolTip, enabled); + } + + private StrictContextMenuItem CreateZoomToExtentsItem(MapData nodeData, string toolTip, bool isEnabled) + { + return new StrictContextMenuItem($"&{MapResources.Ribbon_ZoomToAll}", + toolTip, + MapResources.ZoomToAllIcon, + (sender, args) => MapControl?.ZoomToAllVisibleLayers(nodeData)) + { + Enabled = isEnabled + }; + } + + private static void NotifyMapDataParents(MapDataContext context) + { + foreach (MapDataCollection mapDataCollection in MapDataContextHelper.GetParentsFromContext(context)) + { + mapDataCollection.NotifyObservers(); + } + } + + #endregion + + #region FeatureBasedMapDataContext + + private static Image GetImage(FeatureBasedMapDataContext context) + { + if (context.WrappedData is MapPointData) + { + return MapResources.PointsIcon; + } + + if (context.WrappedData is MapLineData) + { + return MapResources.LineIcon; + } + + if (context.WrappedData is MapPolygonData) + { + return MapResources.AreaIcon; + } + + return GuiResources.folder; + } + + private static void FeatureBasedMapDataContextOnNodeChecked(FeatureBasedMapDataContext mapDataContext, object parentData) + { + mapDataContext.WrappedData.IsVisible = !mapDataContext.WrappedData.IsVisible; + mapDataContext.WrappedData.NotifyObservers(); + + NotifyMapDataParents(mapDataContext); + } + + private static bool CanRemoveMapData(FeatureBasedMapData mapData, object parent) + { + return mapData is IRemovable && parent is MapDataCollectionContext; + } + + private static void RemoveFromParent(FeatureBasedMapData dataToRemove, object parentData) + { + if (CanRemoveMapData(dataToRemove, parentData)) + { + var mapDataCollectionContext = (MapDataCollectionContext) parentData; + var collection = (MapDataCollection) mapDataCollectionContext.WrappedData; + collection.Remove(dataToRemove); + collection.NotifyObservers(); + } + } + + private ContextMenuStrip FeatureBasedMapDataContextContextMenuStrip(FeatureBasedMapDataContext mapDataContext, object parentData, TreeViewControl treeView) + { + return contextMenuBuilderProvider.Get(mapDataContext, treeView) + .AddCustomItem(CreateZoomToExtentsItem(mapDataContext)) + .AddSeparator() + .AddDeleteItem() + .AddSeparator() + .AddPropertiesItem() + .Build(); + } + + #endregion + + #region MapDataCollectionContext + + private static object[] GetCollectionChildNodeObjects(MapDataCollectionContext context) + { + var childObjects = new List(); + var collection = (MapDataCollection) context.WrappedData; + + foreach (MapData mapData in collection.Collection.Reverse()) + { + var mapPointData = mapData as MapPointData; + if (mapPointData != null) + { + childObjects.Add(new MapPointDataContext(mapPointData, context)); + } + + var mapLineData = mapData as MapLineData; + if (mapLineData != null) + { + childObjects.Add(new MapLineDataContext(mapLineData, context)); + } + + var mapPolygonData = mapData as MapPolygonData; + if (mapPolygonData != null) + { + childObjects.Add(new MapPolygonDataContext(mapPolygonData, context)); + } + + var nestedCollection = mapData as MapDataCollection; + if (nestedCollection != null) + { + childObjects.Add(new MapDataCollectionContext(nestedCollection, context)); + } + } + + return childObjects.ToArray(); + } + + private static TreeNodeCheckedState MapDataCollectionContextCheckedState(MapDataCollectionContext context) + { + var mapDataCollection = (MapDataCollection) context.WrappedData; + + switch (mapDataCollection.GetVisibility()) + { + case MapDataCollectionVisibility.Visible: + return TreeNodeCheckedState.Checked; + case MapDataCollectionVisibility.NotVisible: + return TreeNodeCheckedState.Unchecked; + case MapDataCollectionVisibility.Mixed: + return TreeNodeCheckedState.Mixed; + default: + throw new NotSupportedException(); + } + } + + private static void MapDataCollectionContextOnNodeChecked(MapDataCollectionContext context, object parentData) + { + var mapDataCollection = (MapDataCollection) context.WrappedData; + + Dictionary childStates = mapDataCollection.GetFeatureBasedMapDataRecursively().ToDictionary(child => child, child => child.IsVisible); + Dictionary nestedCollectionVisibilityStates = MapDataCollectionHelper.GetNestedCollectionVisibilityStates(mapDataCollection); + + MapDataCollectionVisibility collectionOriginalVisibility = mapDataCollection.GetVisibility(); + + mapDataCollection.IsVisible = collectionOriginalVisibility == MapDataCollectionVisibility.Mixed + || collectionOriginalVisibility == MapDataCollectionVisibility.NotVisible; + mapDataCollection.NotifyObservers(); + + NotifyMapDataCollectionChildren(childStates); + NotifyNestedMapDataCollections(nestedCollectionVisibilityStates); + NotifyMapDataParents(context); + } + + private static void NotifyNestedMapDataCollections(Dictionary childStates) + { + foreach (KeyValuePair child in childStates) + { + if (child.Key.GetVisibility() != child.Value) + { + child.Key.NotifyObservers(); + } + } + } + + private static void NotifyMapDataCollectionChildren(Dictionary childStates) + { + foreach (KeyValuePair child in childStates) + { + if (child.Key.IsVisible != child.Value) + { + child.Key.NotifyObservers(); + } + } + } + + private static bool MapDataCollectionCanDropAndInsert(object draggedData, object targetData) + { + var draggedDataContext = (MapDataContext) draggedData; + var targetDataContext = (MapDataContext) targetData; + object targetDataObject = targetDataContext.WrappedData; + + return draggedDataContext.ParentMapData.WrappedData.Equals(targetDataObject); + } + + private static void MapDataCollectionOnDrop(object droppedData, object newParentData, object oldParentData, int position, TreeViewControl control) + { + var mapDataContext = (MapDataContext) droppedData; + MapData mapData = mapDataContext.WrappedData; + + var parentContext = (MapDataCollectionContext) oldParentData; + var parent = (MapDataCollection) parentContext.WrappedData; + + parent.Remove(mapData); + parent.Insert(parent.Collection.Count() - position, mapData); // Note: target is the same as the previous parent in this case + parent.NotifyObservers(); + } + + private ContextMenuStrip MapDataCollectionContextMenuStrip(MapDataCollectionContext context, object parentData, TreeViewControl treeView) + { + return contextMenuBuilderProvider.Get(context, treeView) + .AddImportItem( + MapResources.MapLegendView_MapDataCollectionContextMenuStrip_Add_MapLayer, + MapResources.MapLegendView_MapDataCollectionContextMenuStrip_Add_MapLayer_ToolTip, + MapResources.MapPlusIcon) + .AddSeparator() + .AddCustomItem(CreateZoomToExtentsItem(context)) + .AddSeparator() + .AddPropertiesItem() + .Build(); + } + + #endregion + } +} \ No newline at end of file Index: Core/Gui/src/Core.Gui/Forms/Map/MapLegendView.resx =================================================================== diff -u --- Core/Gui/src/Core.Gui/Forms/Map/MapLegendView.resx (revision 0) +++ Core/Gui/src/Core.Gui/Forms/Map/MapLegendView.resx (revision 01cc95a0e9b04cbd3560c8f24be0641a31321b48) @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file Index: Core/Gui/src/Core.Gui/Helpers/MapDataContextHelper.cs =================================================================== diff -u --- Core/Gui/src/Core.Gui/Helpers/MapDataContextHelper.cs (revision 0) +++ Core/Gui/src/Core.Gui/Helpers/MapDataContextHelper.cs (revision 01cc95a0e9b04cbd3560c8f24be0641a31321b48) @@ -0,0 +1,59 @@ +// Copyright (C) Stichting Deltares 2021. All rights reserved. +// +// This file is part of Riskeer. +// +// Riskeer is free software: you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +using System; +using System.Collections.Generic; +using Core.Components.Gis.Data; +using Core.Gui.PresentationObjects.Map; + +namespace Core.Gui.Helpers +{ + /// + /// Helper class for . + /// + public static class MapDataContextHelper + { + /// + /// Gets all the parents of the given . + /// + /// The context to get the parents for. + /// A collection of . + /// Thrown when + /// is null. + public static IEnumerable GetParentsFromContext(MapDataContext context) + { + if (context == null) + { + throw new ArgumentNullException(nameof(context)); + } + + var parents = new List(); + + if (context.ParentMapData != null) + { + parents.Add((MapDataCollection) context.ParentMapData.WrappedData); + parents.AddRange(GetParentsFromContext(context.ParentMapData)); + } + + return parents; + } + } +} \ No newline at end of file Index: Core/Gui/src/Core.Gui/PresentationObjects/Map/FeatureBasedMapDataContext.cs =================================================================== diff -u --- Core/Gui/src/Core.Gui/PresentationObjects/Map/FeatureBasedMapDataContext.cs (revision 0) +++ Core/Gui/src/Core.Gui/PresentationObjects/Map/FeatureBasedMapDataContext.cs (revision 01cc95a0e9b04cbd3560c8f24be0641a31321b48) @@ -0,0 +1,52 @@ +// Copyright (C) Stichting Deltares 2021. All rights reserved. +// +// This file is part of Riskeer. +// +// Riskeer is free software: you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +using System; +using Core.Components.Gis.Data; + +namespace Core.Gui.PresentationObjects.Map +{ + /// + /// Presentation object for . + /// + public class FeatureBasedMapDataContext : MapDataContext + { + /// + /// Creates a new instance of . + /// + /// The to wrap. + /// The parent + /// the belongs to. + /// Thrown when any parameter is null. + public FeatureBasedMapDataContext(FeatureBasedMapData wrappedData, MapDataCollectionContext parentMapData) + : base(wrappedData) + { + if (parentMapData == null) + { + throw new ArgumentNullException(nameof(parentMapData)); + } + + ParentMapData = parentMapData; + } + + public override MapDataCollectionContext ParentMapData { get; } + } +} \ No newline at end of file Index: Core/Gui/src/Core.Gui/PresentationObjects/Map/MapDataCollectionContext.cs =================================================================== diff -u --- Core/Gui/src/Core.Gui/PresentationObjects/Map/MapDataCollectionContext.cs (revision 0) +++ Core/Gui/src/Core.Gui/PresentationObjects/Map/MapDataCollectionContext.cs (revision 01cc95a0e9b04cbd3560c8f24be0641a31321b48) @@ -0,0 +1,48 @@ +// Copyright (C) Stichting Deltares 2021. All rights reserved. +// +// This file is part of Riskeer. +// +// Riskeer is free software: you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +using System; +using Core.Components.Gis.Data; + +namespace Core.Gui.PresentationObjects.Map +{ + /// + /// Presentation object for . + /// + public class MapDataCollectionContext : MapDataContext + { + /// + /// Creates a new instance of . + /// + /// The to wrap. + /// The parent + /// the belongs to. + /// Thrown when + /// is null. + public MapDataCollectionContext(MapDataCollection wrappedData, MapDataCollectionContext parentMapData) + : base(wrappedData) + { + ParentMapData = parentMapData; + } + + public override MapDataCollectionContext ParentMapData { get; } + } +} \ No newline at end of file Index: Core/Gui/src/Core.Gui/PresentationObjects/Map/MapDataContext.cs =================================================================== diff -u --- Core/Gui/src/Core.Gui/PresentationObjects/Map/MapDataContext.cs (revision 0) +++ Core/Gui/src/Core.Gui/PresentationObjects/Map/MapDataContext.cs (revision 01cc95a0e9b04cbd3560c8f24be0641a31321b48) @@ -0,0 +1,48 @@ +// Copyright (C) Stichting Deltares 2021. All rights reserved. +// +// This file is part of Riskeer. +// +// Riskeer is free software: you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +using System; +using Core.Common.Controls.PresentationObjects; +using Core.Components.Gis.Data; + +namespace Core.Gui.PresentationObjects.Map +{ + /// + /// Presentation object for . + /// + public abstract class MapDataContext : ObservableWrappedObjectContextBase + { + /// + /// Creates a new instance of . + /// + /// The to wrap. + /// Thrown when + /// is null. + protected MapDataContext(MapData wrappedData) + : base(wrappedData) {} + + /// + /// Gets the parent + /// the belongs to. + /// + public abstract MapDataCollectionContext ParentMapData { get; } + } +} \ No newline at end of file Index: Core/Gui/src/Core.Gui/PresentationObjects/Map/MapLineDataContext.cs =================================================================== diff -u --- Core/Gui/src/Core.Gui/PresentationObjects/Map/MapLineDataContext.cs (revision 0) +++ Core/Gui/src/Core.Gui/PresentationObjects/Map/MapLineDataContext.cs (revision 01cc95a0e9b04cbd3560c8f24be0641a31321b48) @@ -0,0 +1,42 @@ +// Copyright (C) Stichting Deltares 2021. All rights reserved. +// +// This file is part of Riskeer. +// +// Riskeer is free software: you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +using System; +using Core.Components.Gis.Data; + +namespace Core.Gui.PresentationObjects.Map +{ + /// + /// Presentation object for . + /// + public class MapLineDataContext : FeatureBasedMapDataContext + { + /// + /// Creates a new instance of . + /// + /// The to wrap. + /// The parent + /// the belongs to. + /// Thrown when any parameter is null. + public MapLineDataContext(MapLineData wrappedData, MapDataCollectionContext parentMapData) + : base(wrappedData, parentMapData) {} + } +} \ No newline at end of file Index: Core/Gui/src/Core.Gui/PresentationObjects/Map/MapPointDataContext.cs =================================================================== diff -u --- Core/Gui/src/Core.Gui/PresentationObjects/Map/MapPointDataContext.cs (revision 0) +++ Core/Gui/src/Core.Gui/PresentationObjects/Map/MapPointDataContext.cs (revision 01cc95a0e9b04cbd3560c8f24be0641a31321b48) @@ -0,0 +1,42 @@ +// Copyright (C) Stichting Deltares 2021. All rights reserved. +// +// This file is part of Riskeer. +// +// Riskeer is free software: you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +using System; +using Core.Components.Gis.Data; + +namespace Core.Gui.PresentationObjects.Map +{ + /// + /// Presentation object for . + /// + public class MapPointDataContext : FeatureBasedMapDataContext + { + /// + /// Creates a new instance of . + /// + /// The to wrap. + /// The parent + /// the belongs to. + /// Thrown when any parameter is null. + public MapPointDataContext(MapPointData wrappedData, MapDataCollectionContext parentMapData) + : base(wrappedData, parentMapData) {} + } +} \ No newline at end of file Index: Core/Gui/src/Core.Gui/PresentationObjects/Map/MapPolygonDataContext.cs =================================================================== diff -u --- Core/Gui/src/Core.Gui/PresentationObjects/Map/MapPolygonDataContext.cs (revision 0) +++ Core/Gui/src/Core.Gui/PresentationObjects/Map/MapPolygonDataContext.cs (revision 01cc95a0e9b04cbd3560c8f24be0641a31321b48) @@ -0,0 +1,42 @@ +// Copyright (C) Stichting Deltares 2021. All rights reserved. +// +// This file is part of Riskeer. +// +// Riskeer is free software: you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +using System; +using Core.Components.Gis.Data; + +namespace Core.Gui.PresentationObjects.Map +{ + /// + /// Presentation object for . + /// + public class MapPolygonDataContext : FeatureBasedMapDataContext + { + /// + /// Creates a new instance of . + /// + /// The to wrap. + /// The parent + /// the belongs to. + /// Thrown when any parameter is null. + public MapPolygonDataContext(MapPolygonData wrappedData, MapDataCollectionContext parentMapData) + : base(wrappedData, parentMapData) {} + } +} \ No newline at end of file Index: Core/Plugins/src/Core.Plugins.Map/Commands/ToggleMapLegendViewCommand.cs =================================================================== diff -u -rcbde09a1860a8a4480b958d6671de3480b995886 -r01cc95a0e9b04cbd3560c8f24be0641a31321b48 --- Core/Plugins/src/Core.Plugins.Map/Commands/ToggleMapLegendViewCommand.cs (.../ToggleMapLegendViewCommand.cs) (revision cbde09a1860a8a4480b958d6671de3480b995886) +++ Core/Plugins/src/Core.Plugins.Map/Commands/ToggleMapLegendViewCommand.cs (.../ToggleMapLegendViewCommand.cs) (revision 01cc95a0e9b04cbd3560c8f24be0641a31321b48) @@ -20,6 +20,7 @@ // All rights reserved. using Core.Common.Controls.Commands; +using Core.Gui.Forms.Map; using Core.Plugins.Map.Legend; namespace Core.Plugins.Map.Commands Fisheye: Tag 01cc95a0e9b04cbd3560c8f24be0641a31321b48 refers to a dead (removed) revision in file `Core/Plugins/src/Core.Plugins.Map/Helpers/MapDataContextHelper.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Core/Plugins/src/Core.Plugins.Map/Legend/MapLegendController.cs =================================================================== diff -u -r1f136685f17fdb813a32133359e534b461cee899 -r01cc95a0e9b04cbd3560c8f24be0641a31321b48 --- Core/Plugins/src/Core.Plugins.Map/Legend/MapLegendController.cs (.../MapLegendController.cs) (revision 1f136685f17fdb813a32133359e534b461cee899) +++ Core/Plugins/src/Core.Plugins.Map/Legend/MapLegendController.cs (.../MapLegendController.cs) (revision 01cc95a0e9b04cbd3560c8f24be0641a31321b48) @@ -24,6 +24,7 @@ using Core.Components.Gis.Forms; using Core.Gui; using Core.Gui.ContextMenu; +using Core.Gui.Forms.Map; using Core.Gui.Forms.ViewHost; using Core.Plugins.Map.Properties; Fisheye: Tag 01cc95a0e9b04cbd3560c8f24be0641a31321b48 refers to a dead (removed) revision in file `Core/Plugins/src/Core.Plugins.Map/Legend/MapLegendView.Designer.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 01cc95a0e9b04cbd3560c8f24be0641a31321b48 refers to a dead (removed) revision in file `Core/Plugins/src/Core.Plugins.Map/Legend/MapLegendView.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 01cc95a0e9b04cbd3560c8f24be0641a31321b48 refers to a dead (removed) revision in file `Core/Plugins/src/Core.Plugins.Map/Legend/MapLegendView.resx'. Fisheye: No comparison available. Pass `N' to diff? Index: Core/Plugins/src/Core.Plugins.Map/MapPlugin.cs =================================================================== diff -u -r1f136685f17fdb813a32133359e534b461cee899 -r01cc95a0e9b04cbd3560c8f24be0641a31321b48 --- Core/Plugins/src/Core.Plugins.Map/MapPlugin.cs (.../MapPlugin.cs) (revision 1f136685f17fdb813a32133359e534b461cee899) +++ Core/Plugins/src/Core.Plugins.Map/MapPlugin.cs (.../MapPlugin.cs) (revision 01cc95a0e9b04cbd3560c8f24be0641a31321b48) @@ -27,10 +27,10 @@ using Core.Components.Gis.IO.Importers; using Core.Gui; using Core.Gui.Forms.ViewHost; +using Core.Gui.Helpers; using Core.Gui.Plugin; -using Core.Plugins.Map.Helpers; +using Core.Gui.PresentationObjects.Map; using Core.Plugins.Map.Legend; -using Core.Plugins.Map.PresentationObjects; using Core.Plugins.Map.Properties; using Core.Plugins.Map.PropertyClasses; Fisheye: Tag 01cc95a0e9b04cbd3560c8f24be0641a31321b48 refers to a dead (removed) revision in file `Core/Plugins/src/Core.Plugins.Map/PresentationObjects/FeatureBasedMapDataContext.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 01cc95a0e9b04cbd3560c8f24be0641a31321b48 refers to a dead (removed) revision in file `Core/Plugins/src/Core.Plugins.Map/PresentationObjects/MapDataCollectionContext.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 01cc95a0e9b04cbd3560c8f24be0641a31321b48 refers to a dead (removed) revision in file `Core/Plugins/src/Core.Plugins.Map/PresentationObjects/MapDataContext.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 01cc95a0e9b04cbd3560c8f24be0641a31321b48 refers to a dead (removed) revision in file `Core/Plugins/src/Core.Plugins.Map/PresentationObjects/MapLineDataContext.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 01cc95a0e9b04cbd3560c8f24be0641a31321b48 refers to a dead (removed) revision in file `Core/Plugins/src/Core.Plugins.Map/PresentationObjects/MapPointDataContext.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 01cc95a0e9b04cbd3560c8f24be0641a31321b48 refers to a dead (removed) revision in file `Core/Plugins/src/Core.Plugins.Map/PresentationObjects/MapPolygonDataContext.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Core/Plugins/test/Core.Plugins.Map.Test/Commands/ToggleMapLegendViewCommandTest.cs =================================================================== diff -u -r1f136685f17fdb813a32133359e534b461cee899 -r01cc95a0e9b04cbd3560c8f24be0641a31321b48 --- Core/Plugins/test/Core.Plugins.Map.Test/Commands/ToggleMapLegendViewCommandTest.cs (.../ToggleMapLegendViewCommandTest.cs) (revision 1f136685f17fdb813a32133359e534b461cee899) +++ Core/Plugins/test/Core.Plugins.Map.Test/Commands/ToggleMapLegendViewCommandTest.cs (.../ToggleMapLegendViewCommandTest.cs) (revision 01cc95a0e9b04cbd3560c8f24be0641a31321b48) @@ -24,6 +24,7 @@ using Core.Common.Controls.Views; using Core.Gui; using Core.Gui.ContextMenu; +using Core.Gui.Forms.Map; using Core.Gui.Forms.ViewHost; using Core.Plugins.Map.Commands; using Core.Plugins.Map.Legend; Index: Core/Plugins/test/Core.Plugins.Map.Test/Helpers/MapDataContextHelperTest.cs =================================================================== diff -u -rcbde09a1860a8a4480b958d6671de3480b995886 -r01cc95a0e9b04cbd3560c8f24be0641a31321b48 --- Core/Plugins/test/Core.Plugins.Map.Test/Helpers/MapDataContextHelperTest.cs (.../MapDataContextHelperTest.cs) (revision cbde09a1860a8a4480b958d6671de3480b995886) +++ Core/Plugins/test/Core.Plugins.Map.Test/Helpers/MapDataContextHelperTest.cs (.../MapDataContextHelperTest.cs) (revision 01cc95a0e9b04cbd3560c8f24be0641a31321b48) @@ -22,8 +22,8 @@ using System; using System.Collections.Generic; using Core.Components.Gis.Data; -using Core.Plugins.Map.Helpers; -using Core.Plugins.Map.PresentationObjects; +using Core.Gui.Helpers; +using Core.Gui.PresentationObjects.Map; using NUnit.Framework; namespace Core.Plugins.Map.Test.Helpers Index: Core/Plugins/test/Core.Plugins.Map.Test/ImportInfos/MapDataCollectionImportInfoTest.cs =================================================================== diff -u -r1f136685f17fdb813a32133359e534b461cee899 -r01cc95a0e9b04cbd3560c8f24be0641a31321b48 --- Core/Plugins/test/Core.Plugins.Map.Test/ImportInfos/MapDataCollectionImportInfoTest.cs (.../MapDataCollectionImportInfoTest.cs) (revision 1f136685f17fdb813a32133359e534b461cee899) +++ Core/Plugins/test/Core.Plugins.Map.Test/ImportInfos/MapDataCollectionImportInfoTest.cs (.../MapDataCollectionImportInfoTest.cs) (revision 01cc95a0e9b04cbd3560c8f24be0641a31321b48) @@ -27,7 +27,7 @@ using Core.Components.Gis.Data; using Core.Components.Gis.IO.Importers; using Core.Gui.Plugin; -using Core.Plugins.Map.PresentationObjects; +using Core.Gui.PresentationObjects.Map; using Core.Plugins.Map.Properties; using NUnit.Framework; Index: Core/Plugins/test/Core.Plugins.Map.Test/Legend/FeatureBasedMapDataContextTreeNodeInfoTest.cs =================================================================== diff -u -r1f136685f17fdb813a32133359e534b461cee899 -r01cc95a0e9b04cbd3560c8f24be0641a31321b48 --- Core/Plugins/test/Core.Plugins.Map.Test/Legend/FeatureBasedMapDataContextTreeNodeInfoTest.cs (.../FeatureBasedMapDataContextTreeNodeInfoTest.cs) (revision 1f136685f17fdb813a32133359e534b461cee899) +++ Core/Plugins/test/Core.Plugins.Map.Test/Legend/FeatureBasedMapDataContextTreeNodeInfoTest.cs (.../FeatureBasedMapDataContextTreeNodeInfoTest.cs) (revision 01cc95a0e9b04cbd3560c8f24be0641a31321b48) @@ -35,9 +35,10 @@ using Core.Components.Gis.Geometries; using Core.Components.Gis.TestUtil; using Core.Gui.ContextMenu; +using Core.Gui.Forms.Map; +using Core.Gui.PresentationObjects.Map; using Core.Gui.TestUtil.ContextMenu; using Core.Plugins.Map.Legend; -using Core.Plugins.Map.PresentationObjects; using Core.Plugins.Map.Properties; using NUnit.Framework; using Rhino.Mocks; Index: Core/Plugins/test/Core.Plugins.Map.Test/Legend/MapDataCollectionContextTreeNodeInfoTest.cs =================================================================== diff -u -r1f136685f17fdb813a32133359e534b461cee899 -r01cc95a0e9b04cbd3560c8f24be0641a31321b48 --- Core/Plugins/test/Core.Plugins.Map.Test/Legend/MapDataCollectionContextTreeNodeInfoTest.cs (.../MapDataCollectionContextTreeNodeInfoTest.cs) (revision 1f136685f17fdb813a32133359e534b461cee899) +++ Core/Plugins/test/Core.Plugins.Map.Test/Legend/MapDataCollectionContextTreeNodeInfoTest.cs (.../MapDataCollectionContextTreeNodeInfoTest.cs) (revision 01cc95a0e9b04cbd3560c8f24be0641a31321b48) @@ -35,10 +35,11 @@ using Core.Components.Gis.TestUtil; using Core.Gui.Commands; using Core.Gui.ContextMenu; +using Core.Gui.Forms.Map; using Core.Gui.Plugin; +using Core.Gui.PresentationObjects.Map; using Core.Gui.TestUtil.ContextMenu; using Core.Plugins.Map.Legend; -using Core.Plugins.Map.PresentationObjects; using Core.Plugins.Map.Properties; using NUnit.Extensions.Forms; using NUnit.Framework; Index: Core/Plugins/test/Core.Plugins.Map.Test/Legend/MapLegendControllerTest.cs =================================================================== diff -u -r1f136685f17fdb813a32133359e534b461cee899 -r01cc95a0e9b04cbd3560c8f24be0641a31321b48 --- Core/Plugins/test/Core.Plugins.Map.Test/Legend/MapLegendControllerTest.cs (.../MapLegendControllerTest.cs) (revision 1f136685f17fdb813a32133359e534b461cee899) +++ Core/Plugins/test/Core.Plugins.Map.Test/Legend/MapLegendControllerTest.cs (.../MapLegendControllerTest.cs) (revision 01cc95a0e9b04cbd3560c8f24be0641a31321b48) @@ -24,6 +24,7 @@ using Core.Common.Controls.Views; using Core.Gui; using Core.Gui.ContextMenu; +using Core.Gui.Forms.Map; using Core.Gui.Forms.ViewHost; using Core.Plugins.Map.Legend; using NUnit.Framework; Index: Core/Plugins/test/Core.Plugins.Map.Test/Legend/MapLegendViewTest.cs =================================================================== diff -u -r1f136685f17fdb813a32133359e534b461cee899 -r01cc95a0e9b04cbd3560c8f24be0641a31321b48 --- Core/Plugins/test/Core.Plugins.Map.Test/Legend/MapLegendViewTest.cs (.../MapLegendViewTest.cs) (revision 1f136685f17fdb813a32133359e534b461cee899) +++ Core/Plugins/test/Core.Plugins.Map.Test/Legend/MapLegendViewTest.cs (.../MapLegendViewTest.cs) (revision 01cc95a0e9b04cbd3560c8f24be0641a31321b48) @@ -30,8 +30,9 @@ using Core.Components.Gis.Forms; using Core.Components.Gis.TestUtil; using Core.Gui.ContextMenu; +using Core.Gui.Forms.Map; +using Core.Gui.PresentationObjects.Map; using Core.Plugins.Map.Legend; -using Core.Plugins.Map.PresentationObjects; using Core.Plugins.Map.Properties; using NUnit.Framework; using Rhino.Mocks; Index: Core/Plugins/test/Core.Plugins.Map.Test/MapPluginTest.cs =================================================================== diff -u -r1f136685f17fdb813a32133359e534b461cee899 -r01cc95a0e9b04cbd3560c8f24be0641a31321b48 --- Core/Plugins/test/Core.Plugins.Map.Test/MapPluginTest.cs (.../MapPluginTest.cs) (revision 1f136685f17fdb813a32133359e534b461cee899) +++ Core/Plugins/test/Core.Plugins.Map.Test/MapPluginTest.cs (.../MapPluginTest.cs) (revision 01cc95a0e9b04cbd3560c8f24be0641a31321b48) @@ -30,12 +30,13 @@ using Core.Components.Gis.Forms; using Core.Gui; using Core.Gui.Forms.MainWindow; +using Core.Gui.Forms.Map; using Core.Gui.Forms.ViewHost; using Core.Gui.Plugin; +using Core.Gui.PresentationObjects.Map; using Core.Gui.Settings; using Core.Gui.TestUtil; using Core.Plugins.Map.Legend; -using Core.Plugins.Map.PresentationObjects; using Core.Plugins.Map.PropertyClasses; using DotSpatial.Data; using NUnit.Framework; Index: Core/Plugins/test/Core.Plugins.Map.Test/PresentationObjects/FeatureBasedMapDataContextTest.cs =================================================================== diff -u -rcbde09a1860a8a4480b958d6671de3480b995886 -r01cc95a0e9b04cbd3560c8f24be0641a31321b48 --- Core/Plugins/test/Core.Plugins.Map.Test/PresentationObjects/FeatureBasedMapDataContextTest.cs (.../FeatureBasedMapDataContextTest.cs) (revision cbde09a1860a8a4480b958d6671de3480b995886) +++ Core/Plugins/test/Core.Plugins.Map.Test/PresentationObjects/FeatureBasedMapDataContextTest.cs (.../FeatureBasedMapDataContextTest.cs) (revision 01cc95a0e9b04cbd3560c8f24be0641a31321b48) @@ -22,7 +22,7 @@ using System; using Core.Components.Gis.Data; using Core.Components.Gis.TestUtil; -using Core.Plugins.Map.PresentationObjects; +using Core.Gui.PresentationObjects.Map; using NUnit.Framework; namespace Core.Plugins.Map.Test.PresentationObjects Index: Core/Plugins/test/Core.Plugins.Map.Test/PresentationObjects/MapDataCollectionContextTest.cs =================================================================== diff -u -rcbde09a1860a8a4480b958d6671de3480b995886 -r01cc95a0e9b04cbd3560c8f24be0641a31321b48 --- Core/Plugins/test/Core.Plugins.Map.Test/PresentationObjects/MapDataCollectionContextTest.cs (.../MapDataCollectionContextTest.cs) (revision cbde09a1860a8a4480b958d6671de3480b995886) +++ Core/Plugins/test/Core.Plugins.Map.Test/PresentationObjects/MapDataCollectionContextTest.cs (.../MapDataCollectionContextTest.cs) (revision 01cc95a0e9b04cbd3560c8f24be0641a31321b48) @@ -20,7 +20,7 @@ // All rights reserved. using Core.Components.Gis.Data; -using Core.Plugins.Map.PresentationObjects; +using Core.Gui.PresentationObjects.Map; using NUnit.Framework; namespace Core.Plugins.Map.Test.PresentationObjects Index: Core/Plugins/test/Core.Plugins.Map.Test/PresentationObjects/MapDataContextTest.cs =================================================================== diff -u -rcbde09a1860a8a4480b958d6671de3480b995886 -r01cc95a0e9b04cbd3560c8f24be0641a31321b48 --- Core/Plugins/test/Core.Plugins.Map.Test/PresentationObjects/MapDataContextTest.cs (.../MapDataContextTest.cs) (revision cbde09a1860a8a4480b958d6671de3480b995886) +++ Core/Plugins/test/Core.Plugins.Map.Test/PresentationObjects/MapDataContextTest.cs (.../MapDataContextTest.cs) (revision 01cc95a0e9b04cbd3560c8f24be0641a31321b48) @@ -22,7 +22,7 @@ using Core.Common.Controls.PresentationObjects; using Core.Components.Gis.Data; using Core.Components.Gis.TestUtil; -using Core.Plugins.Map.PresentationObjects; +using Core.Gui.PresentationObjects.Map; using NUnit.Framework; namespace Core.Plugins.Map.Test.PresentationObjects Index: Core/Plugins/test/Core.Plugins.Map.Test/PresentationObjects/MapLineDataContextTest.cs =================================================================== diff -u -rcbde09a1860a8a4480b958d6671de3480b995886 -r01cc95a0e9b04cbd3560c8f24be0641a31321b48 --- Core/Plugins/test/Core.Plugins.Map.Test/PresentationObjects/MapLineDataContextTest.cs (.../MapLineDataContextTest.cs) (revision cbde09a1860a8a4480b958d6671de3480b995886) +++ Core/Plugins/test/Core.Plugins.Map.Test/PresentationObjects/MapLineDataContextTest.cs (.../MapLineDataContextTest.cs) (revision 01cc95a0e9b04cbd3560c8f24be0641a31321b48) @@ -20,7 +20,7 @@ // All rights reserved. using Core.Components.Gis.Data; -using Core.Plugins.Map.PresentationObjects; +using Core.Gui.PresentationObjects.Map; using NUnit.Framework; namespace Core.Plugins.Map.Test.PresentationObjects Index: Core/Plugins/test/Core.Plugins.Map.Test/PresentationObjects/MapPointDataContextTest.cs =================================================================== diff -u -rcbde09a1860a8a4480b958d6671de3480b995886 -r01cc95a0e9b04cbd3560c8f24be0641a31321b48 --- Core/Plugins/test/Core.Plugins.Map.Test/PresentationObjects/MapPointDataContextTest.cs (.../MapPointDataContextTest.cs) (revision cbde09a1860a8a4480b958d6671de3480b995886) +++ Core/Plugins/test/Core.Plugins.Map.Test/PresentationObjects/MapPointDataContextTest.cs (.../MapPointDataContextTest.cs) (revision 01cc95a0e9b04cbd3560c8f24be0641a31321b48) @@ -20,7 +20,7 @@ // All rights reserved. using Core.Components.Gis.Data; -using Core.Plugins.Map.PresentationObjects; +using Core.Gui.PresentationObjects.Map; using NUnit.Framework; namespace Core.Plugins.Map.Test.PresentationObjects Index: Core/Plugins/test/Core.Plugins.Map.Test/PresentationObjects/MapPolygonDataContextTest.cs =================================================================== diff -u -rcbde09a1860a8a4480b958d6671de3480b995886 -r01cc95a0e9b04cbd3560c8f24be0641a31321b48 --- Core/Plugins/test/Core.Plugins.Map.Test/PresentationObjects/MapPolygonDataContextTest.cs (.../MapPolygonDataContextTest.cs) (revision cbde09a1860a8a4480b958d6671de3480b995886) +++ Core/Plugins/test/Core.Plugins.Map.Test/PresentationObjects/MapPolygonDataContextTest.cs (.../MapPolygonDataContextTest.cs) (revision 01cc95a0e9b04cbd3560c8f24be0641a31321b48) @@ -20,7 +20,7 @@ // All rights reserved. using Core.Components.Gis.Data; -using Core.Plugins.Map.PresentationObjects; +using Core.Gui.PresentationObjects.Map; using NUnit.Framework; namespace Core.Plugins.Map.Test.PresentationObjects Index: Core/Plugins/test/Core.Plugins.Map.Test/PropertyInfos/MapDataCollectionContextPropertyInfoTest.cs =================================================================== diff -u -r1f136685f17fdb813a32133359e534b461cee899 -r01cc95a0e9b04cbd3560c8f24be0641a31321b48 --- Core/Plugins/test/Core.Plugins.Map.Test/PropertyInfos/MapDataCollectionContextPropertyInfoTest.cs (.../MapDataCollectionContextPropertyInfoTest.cs) (revision 1f136685f17fdb813a32133359e534b461cee899) +++ Core/Plugins/test/Core.Plugins.Map.Test/PropertyInfos/MapDataCollectionContextPropertyInfoTest.cs (.../MapDataCollectionContextPropertyInfoTest.cs) (revision 01cc95a0e9b04cbd3560c8f24be0641a31321b48) @@ -22,8 +22,8 @@ using System.Linq; using Core.Components.Gis.Data; using Core.Gui.Plugin; +using Core.Gui.PresentationObjects.Map; using Core.Gui.PropertyBag; -using Core.Plugins.Map.PresentationObjects; using Core.Plugins.Map.PropertyClasses; using NUnit.Framework; Index: Core/Plugins/test/Core.Plugins.Map.Test/PropertyInfos/MapLineDataContextPropertyInfoTest.cs =================================================================== diff -u -r1f136685f17fdb813a32133359e534b461cee899 -r01cc95a0e9b04cbd3560c8f24be0641a31321b48 --- Core/Plugins/test/Core.Plugins.Map.Test/PropertyInfos/MapLineDataContextPropertyInfoTest.cs (.../MapLineDataContextPropertyInfoTest.cs) (revision 1f136685f17fdb813a32133359e534b461cee899) +++ Core/Plugins/test/Core.Plugins.Map.Test/PropertyInfos/MapLineDataContextPropertyInfoTest.cs (.../MapLineDataContextPropertyInfoTest.cs) (revision 01cc95a0e9b04cbd3560c8f24be0641a31321b48) @@ -22,8 +22,8 @@ using System.Linq; using Core.Components.Gis.Data; using Core.Gui.Plugin; +using Core.Gui.PresentationObjects.Map; using Core.Gui.PropertyBag; -using Core.Plugins.Map.PresentationObjects; using Core.Plugins.Map.PropertyClasses; using NUnit.Framework; Index: Core/Plugins/test/Core.Plugins.Map.Test/PropertyInfos/MapPointDataContextPropertyInfoTest.cs =================================================================== diff -u -r1f136685f17fdb813a32133359e534b461cee899 -r01cc95a0e9b04cbd3560c8f24be0641a31321b48 --- Core/Plugins/test/Core.Plugins.Map.Test/PropertyInfos/MapPointDataContextPropertyInfoTest.cs (.../MapPointDataContextPropertyInfoTest.cs) (revision 1f136685f17fdb813a32133359e534b461cee899) +++ Core/Plugins/test/Core.Plugins.Map.Test/PropertyInfos/MapPointDataContextPropertyInfoTest.cs (.../MapPointDataContextPropertyInfoTest.cs) (revision 01cc95a0e9b04cbd3560c8f24be0641a31321b48) @@ -22,8 +22,8 @@ using System.Linq; using Core.Components.Gis.Data; using Core.Gui.Plugin; +using Core.Gui.PresentationObjects.Map; using Core.Gui.PropertyBag; -using Core.Plugins.Map.PresentationObjects; using Core.Plugins.Map.PropertyClasses; using NUnit.Framework; Index: Core/Plugins/test/Core.Plugins.Map.Test/PropertyInfos/MapPolygonDataContextPropertyInfoTest.cs =================================================================== diff -u -r1f136685f17fdb813a32133359e534b461cee899 -r01cc95a0e9b04cbd3560c8f24be0641a31321b48 --- Core/Plugins/test/Core.Plugins.Map.Test/PropertyInfos/MapPolygonDataContextPropertyInfoTest.cs (.../MapPolygonDataContextPropertyInfoTest.cs) (revision 1f136685f17fdb813a32133359e534b461cee899) +++ Core/Plugins/test/Core.Plugins.Map.Test/PropertyInfos/MapPolygonDataContextPropertyInfoTest.cs (.../MapPolygonDataContextPropertyInfoTest.cs) (revision 01cc95a0e9b04cbd3560c8f24be0641a31321b48) @@ -22,8 +22,8 @@ using System.Linq; using Core.Components.Gis.Data; using Core.Gui.Plugin; +using Core.Gui.PresentationObjects.Map; using Core.Gui.PropertyBag; -using Core.Plugins.Map.PresentationObjects; using Core.Plugins.Map.PropertyClasses; using NUnit.Framework;