Index: DamClients/DamUI/trunk/data/Dam/Waterboards/Groot Salland/Binnenwaarts/GWS/gis-customdata/ShapeFiles/TL_DegreeOfConsolidation.qpj =================================================================== diff -u --- DamClients/DamUI/trunk/data/Dam/Waterboards/Groot Salland/Binnenwaarts/GWS/gis-customdata/ShapeFiles/TL_DegreeOfConsolidation.qpj (revision 0) +++ DamClients/DamUI/trunk/data/Dam/Waterboards/Groot Salland/Binnenwaarts/GWS/gis-customdata/ShapeFiles/TL_DegreeOfConsolidation.qpj (revision 2195) @@ -0,0 +1 @@ +PROJCS["Amersfoort / RD New",GEOGCS["Amersfoort",DATUM["Amersfoort",SPHEROID["Bessel 1841",6377397.155,299.1528128,AUTHORITY["EPSG","7004"]],TOWGS84[565.2369,50.0087,465.658,-0.406857,0.350733,-1.87035,4.0812],AUTHORITY["EPSG","6289"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4289"]],PROJECTION["Oblique_Stereographic"],PARAMETER["latitude_of_origin",52.15616055555555],PARAMETER["central_meridian",5.38763888888889],PARAMETER["scale_factor",0.9999079],PARAMETER["false_easting",155000],PARAMETER["false_northing",463000],UNIT["metre",1,AUTHORITY["EPSG","9001"]],AXIS["X",EAST],AXIS["Y",NORTH],AUTHORITY["EPSG","28992"]] Index: DamClients/DamUI/trunk/data/Dam/Waterboards/Groot Salland/Binnenwaarts/GWS/gis-customdata/ShapeFiles/TL_DegreeOfConsolidation.shp =================================================================== diff -u Binary files differ Index: DamClients/DamUI/trunk/data/Dam/Waterboards/Groot Salland/Binnenwaarts/GWS/gis-customdata/ShapeFiles/TL_DegreeOfConsolidation.cpg =================================================================== diff -u --- DamClients/DamUI/trunk/data/Dam/Waterboards/Groot Salland/Binnenwaarts/GWS/gis-customdata/ShapeFiles/TL_DegreeOfConsolidation.cpg (revision 0) +++ DamClients/DamUI/trunk/data/Dam/Waterboards/Groot Salland/Binnenwaarts/GWS/gis-customdata/ShapeFiles/TL_DegreeOfConsolidation.cpg (revision 2195) @@ -0,0 +1 @@ +UTF-8 \ No newline at end of file Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LocationShapeFileAttributeMap.cs =================================================================== diff -u -r2190 -r2195 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LocationShapeFileAttributeMap.cs (.../LocationShapeFileAttributeMap.cs) (revision 2190) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LocationShapeFileAttributeMap.cs (.../LocationShapeFileAttributeMap.cs) (revision 2195) @@ -713,7 +713,7 @@ createItem(ProbabilityOfFailureStabilityOuterSlopeAttributeId, "probability_of_failure_stability_outerslope.shp", "probstabo", (t, value) => t.ModelFactors.RequiredProbabilityOfFailureStabilityOuterslope = value.ToType()), createItem(ProbabilityOfFailurePipingAttributeId, "probability_of_failure_piping.shp", "probpiping", (t, value) => t.ModelFactors.RequiredProbabilityOfFailurePiping = value.ToType()), createItem(TrafficLoadAttributeId, "trafficload.shp", "TrafLoad", (t, value) => t.TrafficLoad = value.ToType() ), - createItem(TL_DegreeOfConsolidationAttributeId, "TL_DegreeOfConsolidation.shp", "TL_DegOfCo", (t, value) => t.TrafficLoad = value.ToType() ), + createItem(TL_DegreeOfConsolidationAttributeId, "TL_DegreeOfConsolidation.shp", "TL_DegOfCo", (t, value) => t.TL_DegreeOfConsolidation = value.ToType() ), createItem(SafetyFactorPipingAttributeId, "safety_factor_piping.shp", "fpiping", (t, value) => t.ModelFactors.RequiredSafetyFactorPiping = value.ToType()), createItem(SafetyFactorStabilityInnerSlopeAttributeId, "safety_factor_stability_inner_slope.shp", "fstabinner", (t, value) => t.ModelFactors.RequiredSafetyFactorStabilityInnerSlope = value.ToType()), createItem(SafetyFactorStabilityOuterSlopeAttributeId, "safety_factor_stability_outer_slope.shp", "fstabouter", (t, value) => t.ModelFactors.RequiredSafetyFactorStabilityOuterSlope = value.ToType()), Index: DamClients/DamUI/trunk/data/Dam/Waterboards/Groot Salland/Binnenwaarts/GWS/gis-customdata/ShapeFiles/TL_DegreeOfConsolidation.prj =================================================================== diff -u --- DamClients/DamUI/trunk/data/Dam/Waterboards/Groot Salland/Binnenwaarts/GWS/gis-customdata/ShapeFiles/TL_DegreeOfConsolidation.prj (revision 0) +++ DamClients/DamUI/trunk/data/Dam/Waterboards/Groot Salland/Binnenwaarts/GWS/gis-customdata/ShapeFiles/TL_DegreeOfConsolidation.prj (revision 2195) @@ -0,0 +1 @@ +PROJCS["Amersfoort_RD_New",GEOGCS["GCS_Amersfoort",DATUM["D_Amersfoort",SPHEROID["Bessel_1841",6377397.155,299.1528128]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]],PROJECTION["Double_Stereographic"],PARAMETER["latitude_of_origin",52.15616055555555],PARAMETER["central_meridian",5.38763888888889],PARAMETER["scale_factor",0.9999079],PARAMETER["false_easting",155000],PARAMETER["false_northing",463000],UNIT["Meter",1]] \ No newline at end of file Index: DamClients/DamUI/trunk/src/Dam/Tests/DataPluginImporterDataShapeFilesTests.cs =================================================================== diff -u -r2168 -r2195 --- DamClients/DamUI/trunk/src/Dam/Tests/DataPluginImporterDataShapeFilesTests.cs (.../DataPluginImporterDataShapeFilesTests.cs) (revision 2168) +++ DamClients/DamUI/trunk/src/Dam/Tests/DataPluginImporterDataShapeFilesTests.cs (.../DataPluginImporterDataShapeFilesTests.cs) (revision 2195) @@ -64,17 +64,20 @@ new DataAttribute { AttributeId = - LocationShapeFileAttributeMap. - TrafficLoadAttributeId + LocationShapeFileAttributeMap.TrafficLoadAttributeId }, new DataAttribute { AttributeId = - LocationShapeFileAttributeMap. - PenetrationLengthAttributeId + LocationShapeFileAttributeMap.PenetrationLengthAttributeId + }, + new DataAttribute + { + AttributeId = + LocationShapeFileAttributeMap.TL_DegreeOfConsolidationAttributeId } } - }; + }; dataPluginImporter.SetDataSources("", srcDataSources); @@ -93,6 +96,19 @@ Assert.AreEqual("13", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("TrafficLoad")).ParameterValue); } + [Test] + public void CanRetrieveDegreeOfConsolidationFromDataShapeFile() + { + string dikeRingId = dataPluginImporter.GetDikeRingIdList().FirstOrDefault(); + dataPluginImporter.ImportDataForDikeRings(new List { dikeRingId }, null); + + IEnumerable locationDetails = dataPluginImporter.GetLocationDetails(dikeRingId, Location275Id); + var nameValueParameters = locationDetails as NameValueParameter[] ?? locationDetails.ToArray(); + Assert.IsTrue(nameValueParameters.Count() > 0); + + Assert.AreEqual("12.34", nameValueParameters.FirstOrDefault(x => x.ParameterName.Equals("TL_DegreeOfConsolidation")).ParameterValue); + } + /*[Test] public void Import_NoCoverageFoundForPoint_ImporterContinuesAndErrorsAreRetrievable() { Index: DamClients/DamUI/trunk/data/Dam/Waterboards/Groot Salland/Binnenwaarts/GWS/gis-customdata/ShapeFiles/TL_DegreeOfConsolidation.dbf =================================================================== diff -u Binary files differ Index: DamClients/DamUI/trunk/data/Dam/Waterboards/Groot Salland/Binnenwaarts/GWS/gis-customdata/ShapeFiles/TL_DegreeOfConsolidation.shx =================================================================== diff -u Binary files differ