Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Importers/LocationShapeFileImporterTest.cs =================================================================== diff -u -r6436 -r6940 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Importers/LocationShapeFileImporterTest.cs (.../LocationShapeFileImporterTest.cs) (revision 6436) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Importers/LocationShapeFileImporterTest.cs (.../LocationShapeFileImporterTest.cs) (revision 6940) @@ -49,19 +49,13 @@ public void Importer_UsingValidConfiguredAttributed_NewLocationsAddedToImportedItems() { const string locAttributeName = "LID"; - const string dridAttributeName = "DRID"; var configuredAttributes = new List { new DataAttribute { AttributeId = LocationShapeFileAttributeMap.LocationAttributeId, AttributeName = locAttributeName - }, - new DataAttribute - { - AttributeId = LocationShapeFileAttributeMap.DikeRingAttributeId, - AttributeName = dridAttributeName } }; @@ -72,11 +66,9 @@ var l3 = Feature.Create(new Coordinate(1, 1)); l3.AddAttribute(locAttributeName, "loc3"); - l3.AddAttribute(dridAttributeName, "ring5"); var l4 = Feature.Create(new Coordinate(2, 2)); l4.AddAttribute(locAttributeName, "loc4"); - l4.AddAttribute(dridAttributeName, "ring5"); repository.Features.Returns(new[] { @@ -97,18 +89,13 @@ new DataAttribute { AttributeId = LocationShapeFileAttributeMap.LocationAttributeId - }, - new DataAttribute - { - AttributeId = LocationShapeFileAttributeMap.DikeRingAttributeId } }; // Add existing location to test if that is handled correctly var location = new CsvImporterLocations.LocationRecord { LocationId = "loc3", - DikeRingId = "ring5", GeoX = 111.11, GeoY = 222.22 }; @@ -168,15 +155,12 @@ repository = Substitute.For(); LocationAttributeMapping lm = LocationShapeFileAttributeMap.GetAttributeMapping(LocationShapeFileAttributeMap.LocationAttributeId); - LocationAttributeMapping drm = LocationShapeFileAttributeMap.GetAttributeMapping(LocationShapeFileAttributeMap.DikeRingAttributeId); loc3 = Feature.Create(new Coordinate(1, 1)); loc3.AddAttribute(lm.Name, "loc3"); - loc3.AddAttribute(drm.Name, "ring5"); loc4 = Feature.Create(new Coordinate(2, 2)); loc4.AddAttribute(lm.Name, "loc4"); - loc4.AddAttribute(drm.Name, "ring5"); } [TearDown] Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/CsvColumnNames.cs =================================================================== diff -u -r6669 -r6940 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/CsvColumnNames.cs (.../CsvColumnNames.cs) (revision 6669) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/CsvColumnNames.cs (.../CsvColumnNames.cs) (revision 6940) @@ -41,11 +41,6 @@ public const string LocationScenarioColumnName = "location_scenario_id"; /// - /// dikering_id - /// - public const string DikeRingColumnName = "dikering_id"; - - /// /// surfaceline_id /// public const string SurfaceLineColumnName = "surfaceline_id"; Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterLocations.cs =================================================================== diff -u -r6669 -r6940 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterLocations.cs (.../CsvImporterLocations.cs) (revision 6669) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterLocations.cs (.../CsvImporterLocations.cs) (revision 6940) @@ -57,7 +57,6 @@ int colIndexLocationId = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.LocationColumnName); int colIndexSurfacelineId = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.SurfaceLineColumnName); int colIndexSegmentId = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.SegmentColumnName); - int colIndexDikeRingId = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.DikeRingColumnName); int colIndexGeoX = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.XValueColumnName); int colIndexGeoY = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.YValueColumnName); int colIndexXSoilgeometry2DOrigin = CsvReaderUtilities.GetHeaderIndexByString(headers, CsvColumnNames.XSoilGeometry2DOriginColumnName); @@ -135,7 +134,6 @@ locationRecord.SegmentId = csv[colIndexSegmentId]; // Optional columns - locationRecord.DikeRingId = FetchOptionalColumnToString(colIndexDikeRingId, csv); locationRecord.GeoX = FetchOptionalColumnToDouble(colIndexGeoX, csv); locationRecord.GeoY = FetchOptionalColumnToDouble(colIndexGeoY, csv); locationRecord.XSoilGeometry2DOrigin = FetchOptionalColumnToDouble(colIndexXSoilgeometry2DOrigin, csv); @@ -282,7 +280,6 @@ public string LocationId { get; set; } public string SurfaceLineId { get; set; } public string SegmentId { get; set; } - public string DikeRingId { get; set; } public double? GeoX { get; set; } public double? GeoY { get; set; } public double? XSoilGeometry2DOrigin { get; set; } Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LocationShapeFileAttributeMap.cs =================================================================== diff -u -r6669 -r6940 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LocationShapeFileAttributeMap.cs (.../LocationShapeFileAttributeMap.cs) (revision 6669) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LocationShapeFileAttributeMap.cs (.../LocationShapeFileAttributeMap.cs) (revision 6940) @@ -144,14 +144,6 @@ } }, { - DikeRingAttributeId.ToLower(), new LocationAttributeMapping - { - File = LocationShapeFileName, - Id = DikeRingAttributeId, - Name = "DikeringId" - } - }, - { CrossSectionAttributId.ToLower(), new LocationAttributeMapping { File = "crosssection.shp", @@ -262,8 +254,6 @@ get { yield return LocationAttributeId.ToLower(); - yield return DikeRingAttributeId.ToLower(); - //yield return SegmentAttributeId.ToLower(); yield return CrossSectionAttributId.ToLower(); } } @@ -276,11 +266,6 @@ public const string LocationAttributeId = CsvColumnNames.LocationColumnName; /// - /// DikeringId - /// - public const string DikeRingAttributeId = CsvColumnNames.DikeRingColumnName; - - /// /// crosssection /// CustomShape /// crosssection.shp Index: DamClients/DamUI/trunk/src/Dam/Forms/LocationPropertyControl.cs =================================================================== diff -u -r6669 -r6940 --- DamClients/DamUI/trunk/src/Dam/Forms/LocationPropertyControl.cs (.../LocationPropertyControl.cs) (revision 6669) +++ DamClients/DamUI/trunk/src/Dam/Forms/LocationPropertyControl.cs (.../LocationPropertyControl.cs) (revision 6940) @@ -36,7 +36,6 @@ Name = "Location"; - BindSupport.BindTextAndValue(this, DikeLabel, DikeEdit, typeof(Location), "DikeRingId"); BindSupport.BindTextAndValue(this, NameLabel, NameValue, typeof(Location), "Name"); BindSupport.BindTextValueAndUnit(this, XLabel, XEdit, typeof(Location), "XRd"); BindSupport.BindTextValueAndUnit(this, YLabel, YEdit, typeof(Location), "YRd"); Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DataPlugins/DataPluginImporter.cs =================================================================== diff -u -r6932 -r6940 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DataPlugins/DataPluginImporter.cs (.../DataPluginImporter.cs) (revision 6932) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DataPlugins/DataPluginImporter.cs (.../DataPluginImporter.cs) (revision 6940) @@ -956,7 +956,7 @@ if (Dike.Locations.Count > 0) { - Dike.Name = Dike.Locations[0].DikeRingId; + Dike.Name = "Kering"; } isAllDataImported = true; } Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs =================================================================== diff -u -r6932 -r6940 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs (.../CombineImportedData.cs) (revision 6932) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs (.../CombineImportedData.cs) (revision 6940) @@ -786,11 +786,6 @@ location.SurfaceLineId = locationRecord.SurfaceLineId; location.SegmentId = locationRecord.SegmentId; - if (locationRecord.DikeRingId != null) - { - location.DikeRingId = locationRecord.DikeRingId; - } - if (location.DampingFactorPL3 < 0 || location.DampingFactorPL3 > 1) { AddErrorMessage("DampingFactorPl3BeyondLimits", locationRecord); Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs =================================================================== diff -u -r6795 -r6940 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs (.../Location.cs) (revision 6795) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs (.../Location.cs) (revision 6940) @@ -43,7 +43,6 @@ internal static class LocationParameterNames { - public const string DikeRingId = "DikeRingId"; public const string Description = "Description"; public const string XRd = "XRd"; public const string YRd = "YRd"; @@ -480,12 +479,6 @@ } } - [Label("Dike")] - [ReadOnly(true)] - [Category(DikeCategory)] - [PropertyOrder(1, 4)] - public string DikeRingId { get; set; } = ""; - [Browsable(false)] public string SurfaceLineId { get; set; } = ""; [Browsable(false)] public SoilList SoilList { get; set; } @@ -941,7 +934,6 @@ var numberFormatInfo = new NumberFormatInfo(); numberFormatInfo.NumberDecimalSeparator = "."; var nameValuePairs = new Dictionary(); - nameValuePairs.Add(LocationParameterNames.DikeRingId, DikeRingId); nameValuePairs.Add(LocationParameterNames.SurfaceLineId, SurfaceLineId); nameValuePairs.Add(LocationParameterNames.Description, Description); nameValuePairs.Add(LocationParameterNames.XRd, XRd.ToString(numberFormatInfo)); @@ -1210,11 +1202,7 @@ { var numberFormatInfo = new NumberFormatInfo(); numberFormatInfo.NumberDecimalSeparator = "."; - if (parameterName.Equals(LocationParameterNames.DikeRingId)) - { - DikeRingId = parameterValue; - } - + if (parameterName.Equals(LocationParameterNames.Description)) { Description = parameterValue; Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LocationShapeFileImporter.cs =================================================================== diff -u -r6436 -r6940 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LocationShapeFileImporter.cs (.../LocationShapeFileImporter.cs) (revision 6436) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LocationShapeFileImporter.cs (.../LocationShapeFileImporter.cs) (revision 6940) @@ -125,14 +125,9 @@ DataAttribute configuredAttribute = configuredAttributes.Single(a => a.AttributeId.Equals(locationAttrId, StringComparison.InvariantCultureIgnoreCase)); LocationAttributeMapping locationMapping = LocationShapeFileAttributeMap.GetAttributeMapping(configuredAttribute, locationAttrId); - const string dikeRingAttrId = LocationShapeFileAttributeMap.DikeRingAttributeId; - configuredAttribute = configuredAttributes.SingleOrDefault(a => a.AttributeId.Equals(dikeRingAttrId, StringComparison.InvariantCultureIgnoreCase)); - LocationAttributeMapping dikeRingMapping = LocationShapeFileAttributeMap.GetAttributeMapping(configuredAttribute, dikeRingAttrId); - foreach (IFeature feature in Repository.Features) { var locationIDValue = feature.Attributes[locationMapping.Name].ToString(); - var dikeRingIdValue = feature.Attributes[dikeRingMapping.Name].ToString(); //Locations are read from shapefile after the locations have been read from locations.csv //If a location already exists, overwrite the existing location @@ -145,7 +140,6 @@ } locationRecord.LocationId = locationIDValue; - locationRecord.DikeRingId = dikeRingIdValue; locationRecord.GeoX = feature.Geometry.Coordinate.X; locationRecord.GeoY = feature.Geometry.Coordinate.Y; if (newLocation) Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/IO/CombineImportedDataTest.cs =================================================================== diff -u -r6932 -r6940 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/IO/CombineImportedDataTest.cs (.../CombineImportedDataTest.cs) (revision 6932) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/IO/CombineImportedDataTest.cs (.../CombineImportedDataTest.cs) (revision 6940) @@ -60,12 +60,6 @@ AttributeId = "location_id", AttributeName = "LOCATIONID", DataSource = "LocationID.shp" - }, - new DataAttribute - { - AttributeId = "dikering_id", - AttributeName = "DIKERINGID", - DataSource = "LocationID.shp" } }; var locationRecords = new List(); @@ -81,10 +75,8 @@ { progress = null; var csvImporter = new CsvImporter(); - string dikeRingId = damProjectData.Dike.Name; foreach (CsvImporterLocations.LocationRecord locationRecord in locationRecords) { - locationRecord.DikeRingId = dikeRingId; locationRecord.SegmentId = "1"; locationRecord.SurfaceLineId = "1"; } Index: DamClients/DamUI/trunk/src/Dam/Forms/LocationPropertyControl.Designer.cs =================================================================== diff -u -r6785 -r6940 --- DamClients/DamUI/trunk/src/Dam/Forms/LocationPropertyControl.Designer.cs (.../LocationPropertyControl.Designer.cs) (revision 6785) +++ DamClients/DamUI/trunk/src/Dam/Forms/LocationPropertyControl.Designer.cs (.../LocationPropertyControl.Designer.cs) (revision 6940) @@ -55,8 +55,6 @@ this.TrafficLoadDistributionAngleEdit = new DevExpress.XtraEditors.SpinEdit(); this.TrafficLoadDistributionAngleLabel = new DevExpress.XtraEditors.LabelControl(); this.IdentificationGroupControl = new DevExpress.XtraEditors.GroupControl(); - this.DikeEdit = new DevExpress.XtraEditors.TextEdit(); - this.DikeLabel = new DevExpress.XtraEditors.LabelControl(); this.YEdit = new DevExpress.XtraEditors.SpinEdit(); this.YLabel = new DevExpress.XtraEditors.LabelControl(); this.XEdit = new DevExpress.XtraEditors.SpinEdit(); @@ -87,7 +85,6 @@ ((System.ComponentModel.ISupportInitialize)(this.TrafficLoadDistributionAngleEdit.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.IdentificationGroupControl)).BeginInit(); this.IdentificationGroupControl.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.DikeEdit.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.YEdit.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.XEdit.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize) (this.NameValue.Properties)).BeginInit(); @@ -176,8 +173,6 @@ // // IdentificationGroupControl // - this.IdentificationGroupControl.Controls.Add(this.DikeEdit); - this.IdentificationGroupControl.Controls.Add(this.DikeLabel); this.IdentificationGroupControl.Controls.Add(this.YEdit); this.IdentificationGroupControl.Controls.Add(this.YLabel); this.IdentificationGroupControl.Controls.Add(this.XEdit); @@ -187,27 +182,10 @@ this.IdentificationGroupControl.Dock = System.Windows.Forms.DockStyle.Top; this.IdentificationGroupControl.Location = new System.Drawing.Point(0, 0); this.IdentificationGroupControl.Name = "IdentificationGroupControl"; - this.IdentificationGroupControl.Size = new System.Drawing.Size(287, 155); + this.IdentificationGroupControl.Size = new System.Drawing.Size(287, 129); this.IdentificationGroupControl.TabIndex = 47; this.IdentificationGroupControl.Text = "Identification"; - // - // DikeEdit - // - this.DikeEdit.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.DikeEdit.Location = new System.Drawing.Point(129, 39); - this.DikeEdit.Name = "DikeEdit"; - this.DikeEdit.Size = new System.Drawing.Size(144, 20); - this.DikeEdit.TabIndex = 56; - // - // DikeLabel - // - this.DikeLabel.Location = new System.Drawing.Point(12, 42); - this.DikeLabel.Name = "DikeLabel"; - this.DikeLabel.Size = new System.Drawing.Size(20, 13); - this.DikeLabel.TabIndex = 55; - this.DikeLabel.Text = "Dike"; - // + // // YEdit // this.YEdit.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) @@ -218,7 +196,7 @@ 0, 0}); this.YEdit.EnterMoveNextControl = true; - this.YEdit.Location = new System.Drawing.Point(129, 117); + this.YEdit.Location = new System.Drawing.Point(129, 91); this.YEdit.Name = "YEdit"; this.YEdit.Properties.DisplayFormat.FormatType = DevExpress.Utils.FormatType.Numeric; this.YEdit.Properties.EditFormat.FormatString = "F3"; @@ -230,7 +208,7 @@ // // YLabel // - this.YLabel.Location = new System.Drawing.Point(12, 120); + this.YLabel.Location = new System.Drawing.Point(12, 94); this.YLabel.Name = "YLabel"; this.YLabel.Size = new System.Drawing.Size(6, 13); this.YLabel.TabIndex = 53; @@ -246,7 +224,7 @@ 0, 0}); this.XEdit.EnterMoveNextControl = true; - this.XEdit.Location = new System.Drawing.Point(129, 91); + this.XEdit.Location = new System.Drawing.Point(129, 65); this.XEdit.Name = "XEdit"; this.XEdit.Properties.DisplayFormat.FormatType = DevExpress.Utils.FormatType.Numeric; this.XEdit.Properties.EditFormat.FormatString = "F3"; @@ -258,7 +236,7 @@ // // XLabel // - this.XLabel.Location = new System.Drawing.Point(12, 94); + this.XLabel.Location = new System.Drawing.Point(12, 68); this.XLabel.Name = "XLabel"; this.XLabel.Size = new System.Drawing.Size(6, 13); this.XLabel.TabIndex = 51; @@ -268,14 +246,14 @@ // this.NameValue.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.NameValue.Location = new System.Drawing.Point(129, 65); + this.NameValue.Location = new System.Drawing.Point(129, 39); this.NameValue.Name = "NameValue"; this.NameValue.Size = new System.Drawing.Size(144, 20); this.NameValue.TabIndex = 50; // // NameLabel // - this.NameLabel.Location = new System.Drawing.Point(12, 68); + this.NameLabel.Location = new System.Drawing.Point(12, 42); this.NameLabel.Name = "NameLabel"; this.NameLabel.Size = new System.Drawing.Size(27, 13); this.NameLabel.TabIndex = 34; @@ -512,7 +490,6 @@ ((System.ComponentModel.ISupportInitialize)(this.IdentificationGroupControl)).EndInit(); this.IdentificationGroupControl.ResumeLayout(false); this.IdentificationGroupControl.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.DikeEdit.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.YEdit.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.XEdit.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.NameValue.Properties)).EndInit(); @@ -561,8 +538,6 @@ private DevExpress.XtraEditors.GroupControl CalculationGroupControl; private DevExpress.XtraEditors.LabelControl ZoneLabel; private DevExpress.XtraEditors.ComboBoxEdit ZoneEdit; - private DevExpress.XtraEditors.TextEdit DikeEdit; - private DevExpress.XtraEditors.LabelControl DikeLabel; private DevExpress.XtraEditors.LabelControl MininumCircleDepthLabel; private DevExpress.XtraEditors.ComboBoxEdit PLLineCreationMethodComboBox; private DevExpress.XtraEditors.LabelControl PLLineCreationMethodLabel; Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DataPluginImporterDataShapeFilesTests.cs =================================================================== diff -u -r6873 -r6940 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DataPluginImporterDataShapeFilesTests.cs (.../DataPluginImporterDataShapeFilesTests.cs) (revision 6873) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DataPluginImporterDataShapeFilesTests.cs (.../DataPluginImporterDataShapeFilesTests.cs) (revision 6940) @@ -188,12 +188,6 @@ }, new DataAttribute { - AttributeId = LocationShapeFileAttributeMap.DikeRingAttributeId, - AttributeName = "DikeringID", - DataSource = "Locations2.shp" - }, - new DataAttribute - { AttributeId = LocationShapeFileAttributeMap.CrossSectionAttributId, AttributeName = "LocationID", DataSource = "Crosssections.shp" Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DataPluginImporterTests.cs =================================================================== diff -u -r6933 -r6940 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DataPluginImporterTests.cs (.../DataPluginImporterTests.cs) (revision 6933) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DataPluginImporterTests.cs (.../DataPluginImporterTests.cs) (revision 6940) @@ -124,7 +124,7 @@ Assert.That(info.Description, Is.EqualTo("Dike")); } - Assert.That(info.Name, Is.EqualTo("dijkring10")); + Assert.That(info.Name, Is.EqualTo("Kering")); } /// @@ -792,12 +792,6 @@ AttributeName = "LocationId", DataSource = "Locationv2.shp" }, - new DataAttribute - { - AttributeId = LocationShapeFileAttributeMap.DikeRingAttributeId, - AttributeName = "DIKERINGID", - DataSource = "Locationv2.shp" - }, // Head Pl2 will be put in location, Head Pl3 will be put in scenario if not already imported from scenarios.csv new DataAttribute { @@ -858,12 +852,6 @@ }, new DataAttribute { - AttributeId = LocationShapeFileAttributeMap.DikeRingAttributeId, - AttributeName = "DikeRingId", - DataSource = "Locations.shp" - }, - new DataAttribute - { AttributeId = LocationShapeFileAttributeMap.HeadPl3AttributeId, AttributeName = "HEADPL3", DataSource = shapefile