Index: data/D-Soil Model/SOS-data/SOSDatabase.soil =================================================================== diff -u -r537 -r666 Binary files differ Index: src/Deltares.DSoilModel.Forms/DSoilModelMapEditor.cs =================================================================== diff -u -r644 -r666 --- src/Deltares.DSoilModel.Forms/DSoilModelMapEditor.cs (.../DSoilModelMapEditor.cs) (revision 644) +++ src/Deltares.DSoilModel.Forms/DSoilModelMapEditor.cs (.../DSoilModelMapEditor.cs) (revision 666) @@ -51,11 +51,6 @@ { private const int labelFontSize = 9; private readonly MapEditor mapEditor; - - // DSB-709, temporary disabled for WTI - //private readonly List mappedSoilProfiles1D = new List(); - //private readonly List mappedSoilProfiles2D = new List(); - private readonly Panel panel = new Panel(); // only one segment can be split at a time, but these need to be lists so we can add them to the map as layers @@ -76,11 +71,6 @@ mapEditor.WebLayerType = MapEditor.WebLayerTypes.OpenStreetMapnik; mapEditor.RegisterLayer(typeof(ConePenetrationTestData), new MapLayerDefinition(FeatureType.Point, "CPTs", Resources.CPT)); mapEditor.RegisterLayer(typeof(Boring), new MapLayerDefinition(FeatureType.Point, "Borings", Resources.Boring)); - - // DSB-709, temporary disabled for WTI - //mapEditor.RegisterLayer(typeof(SoilProfile1D), new MapLayerDefinition(FeatureType.Point, "1D Geometry", Resources.SoilProfile)); - //mapEditor.RegisterLayer(typeof(SoilProfile2D), new MapLayerDefinition(FeatureType.Line, "2D Geometry", Color.Lime)); - mapEditor.RegisterLayer(typeof(SoilSegment), new MapLayerDefinition(FeatureType.Line, "Soil Segment", Color.DarkBlue)); mapEditor.RegisterLayer(typeof(HighlightSoilSegment), new MapLayerDefinition(FeatureType.Line, "Split soil Segment", Color.DarkOrange, false)); mapEditor.RegisterLayer(typeof(SoilSegmentSplitLocation), SegmentSplitLocationLayerDefinition()); @@ -117,13 +107,6 @@ mapEditor.Clear(); mapEditor.AddLayer(project.CPTs); mapEditor.AddLayer(project.Borings); - - // DSB-709, temporary disabled for WTI - //UpdateSoilProfiles1D(); - //mapEditor.AddLayer(mappedSoilProfiles1D); - //UpdateSoilProfiles2D(); - //mapEditor.AddLayer(mappedSoilProfiles2D); - mapEditor.AddLayer(project.CurrentSoilSegments); mapEditor.ZoomData(); @@ -385,16 +368,6 @@ return; } - // DSB-709, temporary disabled for WTI - //if (sender == project.SoilProfiles1D) - //{ - // UpdateSoilProfiles1D(); - //} - //if (sender == project.SoilProfiles2D) - //{ - // UpdateSoilProfiles2D(); - //} - if (sender == project.SoilSegments) { // ended split operation in segment geometry editor ? @@ -417,24 +390,6 @@ private void DataEventPublisher_OnAfterChange(object sender, PublishEventArgs e) { - // DSB-709, temporary disabled for WTI - //var soilProfile1D = sender as SoilProfile1D; - //if (soilProfile1D != null) - //{ - // if (e.Property != null && (e.Property.Equals("X") || e.Property.Equals("Y"))) - // { - // UpdateSoilProfiles1D(); - // } - //} - //var soilProfile2D = sender as SoilProfile2D; - //if (soilProfile2D != null) - //{ - // if (e.Property != null && (e.Property.Equals("XBegin") || e.Property.Equals("YBegin") || e.Property.Equals("XEnd") || e.Property.Equals("XEnd"))) - // { - // UpdateSoilProfiles2D(); - // } - //} - var splitLocation = sender as SoilSegmentSplitLocation; if (splitLocation != null && (e.Property == "X" || e.Property == "Y")) { @@ -477,21 +432,6 @@ } } - // DSB-709, temporary disabled for WTI - //private void UpdateSoilProfiles1D() - //{ - // mappedSoilProfiles1D.Clear(); - // mappedSoilProfiles1D.AddRange(project.SoilProfiles1D.Where(sp => !double.IsNaN(sp.Location.X) && !double.IsNaN(sp.Location.Y))); - // DataEventPublisher.DataListModified(mappedSoilProfiles1D); - //} - - //private void UpdateSoilProfiles2D() - //{ - // mappedSoilProfiles2D.Clear(); - // mappedSoilProfiles2D.AddRange(project.SoilProfiles2D.Where(sp => !double.IsNaN(sp.Location.X) && !double.IsNaN(sp.Location.Y))); - // DataEventPublisher.DataListModified(mappedSoilProfiles2D); - //} - private SoilSegmentSplitLocation AddSegmentSplitter(SoilSegment segment, SoilSegmentSplitLocation splitLocation = null) { if (segment.Points != null && segment.Points.Count > 1)