Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Deltares.Dam.Tests.csproj =================================================================== diff -u -r4510 -r4511 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Deltares.Dam.Tests.csproj (.../Deltares.Dam.Tests.csproj) (revision 4510) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Deltares.Dam.Tests.csproj (.../Deltares.Dam.Tests.csproj) (revision 4511) @@ -1041,6 +1041,63 @@ PreserveNewest + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/TestData/HHNKShapeFiles/TrafficLoad.shx =================================================================== diff -u Binary files differ Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/TestData/GrootSallandBinnenwaarts/soilprofiles.csv =================================================================== diff -u -r4507 -r4511 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/TestData/GrootSallandBinnenwaarts/soilprofiles.csv (.../soilprofiles.csv) (revision 4507) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/TestData/GrootSallandBinnenwaarts/soilprofiles.csv (.../soilprofiles.csv) (revision 4511) @@ -1,61 +1,61 @@ -soilprofile_id;top_level;soil_name;soiltype -10Y_005_STBI_p;60;klei antropogeen;klei -10Y_005_STBI_p;0.63;klei;zand -10Y_005_STBI_p;-1.2;veen;veen -10Y_005_STBI_p;-3.5;WL_zand;zand -10Y_024_STBI_p;60;veen;veen -10Y_024_STBI_p;-4.5;WL_zand;zand -10Y_041_STBI_p;60;veen;veen -10Y_041_STBI_p;-1.5;WL_zand;zand -10Y_054_STBI_p;60;veen;veen -10Y_054_STBI_p;-2;WL_zand;zand -10Y_066_STBI_p;60;klei;klei -10Y_066_STBI_p;-1.5;veen;veen -10Y_066_STBI_p;-4;WL_zand;zand -10Y_090_STBI_p;60;Klei, atropogeen;klei -10Y_090_STBI_p;-1.5;WL_zand;zand -10Y_102_STBI_p;60;veen;veen -10Y_102_STBI_p;-2;WL_zand;zand -10Y_117_STBI_p;60;veen;veen -10Y_117_STBI_p;-4.17;WL_zand;zand -10Y_130_STBI_p;60;klei;klei -10Y_130_STBI_p;-1.14;veen;veen -10Y_130_STBI_p;-4.8;WL_zand;zand -10Y_149_STBI_p;60;klei;klei -10Y_149_STBI_p;-3.2;veen;veen -10Y_149_STBI_p;-5;WL_zand;zand -10Z_157_STBI_p;60;klei duinkerke;klei -10Z_157_STBI_p;-2;veen Holland (naast);veen -10Z_157_STBI_p;-4;WL_zand;zand -10Z_165_STBI_p;60;veen Holland (naast);veen -10Z_165_STBI_p;-2.8;WL_zand;zand -10Z_181_STBI_p;60;klei duinkerke;klei -10Z_181_STBI_p;-2.1;veen Holland (naast);veen -10Z_181_STBI_p;-3.8;WL_zand;zand -10Z_186_STBI_p;60;veen Holland (naast);veen -10Z_186_STBI_p;-4.2;WL_zand;zand -10Z_199_STBI_p;60;veen Holland (naast);veen -10Z_199_STBI_p;-4.5;WL_zand;zand -10Z_228_STBI_p;60;klei duinkerke;klei -10Z_228_STBI_p;-1.1;veen holland (naast);veen -10Z_228_STBI_p;-4;WL_zand;zand -10Z_258_STBI_p;60;veen holland (naast);veen -10Z_258_STBI_p;-3.7;WL_zand;zand -10Z_275_STBI_p;60;klei duin;klei -10Z_275_STBI_p;-2.2;veen naast;veen -10Z_275_STBI_p;-4.4;WL_zand;zand -10Z_282_STBI_p;60;klei duinkerke;klei -10Z_282_STBI_p;-2;veen naast;veen -10Z_282_STBI_p;-4;WL_zand;zand -10Z_380_STBI_p;60;hollandveen (hvn);veen -10Z_380_STBI_p;-2.5;WL_zand;zand -10Z_390_STBI_p;60;hollandveen (hvn);veen -10Z_390_STBI_p;-1.88;WL_zand;zand -10Z_400_STBI_p;60;hollandveen (hvn);veen -10Z_400_STBI_p;-0.9;hollandveen (hvn);veen -10Z_400_STBI_p;-2;WL_zand;zand -10Z_421_STBI_p;60;WL_zand;zand -10Z_432_STBI_p;60;WL_zand;zand -10Z_460_STBI_p;60;WL_zand;zand -10Z_475_STBI_p;60;hollandveen (hvn);veen -10Z_475_STBI_p;-1.2;WL_zand;zand +soilprofile_id;top_level;soil_name;soiltype;is_aquifer +10Y_005_STBI_p;60;klei antropogeen;klei;FALSE +10Y_005_STBI_p;0.63;klei;zand;TRUE +10Y_005_STBI_p;-1.2;veen;veen;FALSE +10Y_005_STBI_p;-3.5;WL_zand;zand;TRUE +10Y_024_STBI_p;60;veen;veen;FALSE +10Y_024_STBI_p;-4.5;WL_zand;zand;TRUE +10Y_041_STBI_p;60;veen;veen;FALSE +10Y_041_STBI_p;-1.5;WL_zand;zand;TRUE +10Y_054_STBI_p;60;veen;veen;FALSE +10Y_054_STBI_p;-2;WL_zand;zand;TRUE +10Y_066_STBI_p;60;klei;klei;FALSE +10Y_066_STBI_p;-1.5;veen;veen;FALSE +10Y_066_STBI_p;-4;WL_zand;zand;TRUE +10Y_090_STBI_p;60;Klei, atropogeen;klei;FALSE +10Y_090_STBI_p;-1.5;WL_zand;zand;TRUE +10Y_102_STBI_p;60;veen;veen;FALSE +10Y_102_STBI_p;-2;WL_zand;zand;TRUE +10Y_117_STBI_p;60;veen;veen;FALSE +10Y_117_STBI_p;-4.17;WL_zand;zand;TRUE +10Y_130_STBI_p;60;klei;klei;FALSE +10Y_130_STBI_p;-1.14;veen;veen;FALSE +10Y_130_STBI_p;-4.8;WL_zand;zand;TRUE +10Y_149_STBI_p;60;klei;klei;FALSE +10Y_149_STBI_p;-3.2;veen;veen;FALSE +10Y_149_STBI_p;-5;WL_zand;zand;TRUE +10Z_157_STBI_p;60;klei duinkerke;klei;FALSE +10Z_157_STBI_p;-2;veen Holland (naast);veen;FALSE +10Z_157_STBI_p;-4;WL_zand;zand;TRUE +10Z_165_STBI_p;60;veen Holland (naast);veen;FALSE +10Z_165_STBI_p;-2.8;WL_zand;zand;TRUE +10Z_181_STBI_p;60;klei duinkerke;klei;FALSE +10Z_181_STBI_p;-2.1;veen Holland (naast);veen;FALSE +10Z_181_STBI_p;-3.8;WL_zand;zand;TRUE +10Z_186_STBI_p;60;veen Holland (naast);veen;FALSE +10Z_186_STBI_p;-4.2;WL_zand;zand;TRUE +10Z_199_STBI_p;60;veen Holland (naast);veen;FALSE +10Z_199_STBI_p;-4.5;WL_zand;zand;TRUE +10Z_228_STBI_p;60;klei duinkerke;klei;FALSE +10Z_228_STBI_p;-1.1;veen holland (naast);veen;FALSE +10Z_228_STBI_p;-4;WL_zand;zand;TRUE +10Z_258_STBI_p;60;veen holland (naast);veen;FALSE +10Z_258_STBI_p;-3.7;WL_zand;zand;TRUE +10Z_275_STBI_p;60;klei duin;klei;FALSE +10Z_275_STBI_p;-2.2;veen naast;veen;FALSE +10Z_275_STBI_p;-4.4;WL_zand;zand;TRUE +10Z_282_STBI_p;60;klei duinkerke;klei;FALSE +10Z_282_STBI_p;-2;veen naast;veen;FALSE +10Z_282_STBI_p;-4;WL_zand;zand;TRUE +10Z_380_STBI_p;60;hollandveen (hvn);veen;FALSE +10Z_380_STBI_p;-2.5;WL_zand;zand;TRUE +10Z_390_STBI_p;60;hollandveen (hvn);veen;FALSE +10Z_390_STBI_p;-1.88;WL_zand;zand;TRUE +10Z_400_STBI_p;60;hollandveen (hvn);veen;FALSE +10Z_400_STBI_p;-0.9;hollandveen (hvn);veen;FALSE +10Z_400_STBI_p;-2;WL_zand;zand;TRUE +10Z_421_STBI_p;60;WL_zand;zand;TRUE +10Z_432_STBI_p;60;WL_zand;zand;TRUE +10Z_460_STBI_p;60;WL_zand;zand;TRUE +10Z_475_STBI_p;60;hollandveen (hvn);veen;FALSE +10Z_475_STBI_p;-1.2;WL_zand;zand;TRUE Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/TestData/HHNKShapeFiles/Polderlevel.sbn =================================================================== diff -u Binary files differ Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/TestData/HHNKShapeFiles/Crosssection.sbx =================================================================== diff -u Binary files differ Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/TestData/HHNKShapeFiles/Polderlevel.prj =================================================================== diff -u --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/TestData/HHNKShapeFiles/Polderlevel.prj (revision 0) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/TestData/HHNKShapeFiles/Polderlevel.prj (revision 4511) @@ -0,0 +1 @@ +PROJCS["RD_New",GEOGCS["GCS_Amersfoort",DATUM["D_Amersfoort",SPHEROID["Bessel_1841",6377397.155,299.1528128]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]],PROJECTION["Double_Stereographic"],PARAMETER["False_Easting",155000.0],PARAMETER["False_Northing",463000.0],PARAMETER["Central_Meridian",5.38763888888889],PARAMETER["Scale_Factor",0.9999079],PARAMETER["Latitude_Of_Origin",52.15616055555555],UNIT["Meter",1.0]] \ No newline at end of file Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/TestData/HHNKShapeFiles/TrafficLoad.shp.xml =================================================================== diff -u --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/TestData/HHNKShapeFiles/TrafficLoad.shp.xml (revision 0) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/TestData/HHNKShapeFiles/TrafficLoad.shp.xml (revision 4511) @@ -0,0 +1,8 @@ + + +2012011911210500FALSECreateFeatureclass G:\01_Componenten\02_Projecten\030102_Legger_RWK\05_DWK_RWK\Data_constr DWK_Reg_waterk_Concept_28_04_09 # DWK_V5_Layer SAME_AS_TEMPLATE SAME_AS_TEMPLATE "PROJCS['RD_New',GEOGCS['GCS_Amersfoort',DATUM['D_Amersfoort',SPHEROID['Bessel_1841',6377397.155,299.1528128]],PRIMEM['Greenwich',0.0],UNIT['Degree',0.0174532925199433]],PROJECTION['Double_Stereographic'],PARAMETER['False_Easting',155000.0],PARAMETER['False_Northing',463000.0],PARAMETER['Central_Meridian',5.38763888888889],PARAMETER['Scale_Factor',0.9999079],PARAMETER['Latitude_Of_Origin',52.15616055555555],UNIT['Meter',1.0]];80000 477000 19884,1078240741;0 100000;0 100000" # 0 0 0 G:\01_Componenten\02_Projecten\030102_Legger_RWK\05_DWK_RWK\Data_constr\DWK_Reg_waterk_Concept_28_04_09.shpAppend DWK_V5_Layer G:\01_Componenten\02_Projecten\030102_Legger_RWK\05_DWK_RWK\Data_constr\DWK_Reg_waterk_Concept_28_04_09.shp TEST G:\01_Componenten\02_Projecten\030102_Legger_RWK\05_DWK_RWK\Data_constr\DWK_Reg_waterk_Concept_28_04_09.shpFeatureClassToFeatureClass G:\01_Componenten\02_Projecten\030102_Legger_RWK\05_DWK_RWK\Data_constr\Cleanup\cleanup_topology.mdb\DWK\DWK_V5 G:\01_Componenten\02_Projecten\030102_Legger_RWK\05_DWK_RWK\Data_constr DWK_Reg_waterk_Concept_28_04_09 # "DWK_IDENT DWK_IDENT VISIBLE;DWK_NAAM DWK_NAAM VISIBLE;DWK_SOORT DWK_SOORT VISIBLE;GDR_IDENT GDR_IDENT VISIBLE;GDR_IDENT2 GDR_IDENT2 VISIBLE;COUNT_OVK COUNT_OVK VISIBLE;LENGTH LENGTH VISIBLE;Gedaan Gedaan VISIBLE;Shape_Length Shape_Leng VISIBLE" SAME_AS_TEMPLATE SAME_AS_TEMPLATE # 0 G:\01_Componenten\02_Projecten\030102_Legger_RWK\05_DWK_RWK\Data_constr\DWK_Reg_waterk_Concept_28_04_09.shpFeatureClassToFeatureClass "G:\01_Componenten\01_Beheer\03_Objectdata_HHNK\02_Waterkeringen\02_Regionale waterkeringen\01_Legger_en_Beheerregister\DWK_Reg_waterk_Concept.shp" "Database Connections\Connection to srv79d1_INTWIS2.sde" HHNK_DWK_REG_WATERK_CONCEPT # "DWK_IDENT 'DWK_IDENT' true true false 254 Text 0 0 ,First,#,G:\01_Componenten\01_Beheer\03_Objectdata_HHNK\02_Waterkeringen\02_Regionale waterkeringen\01_Legger_en_Beheerregister\DWK_Reg_waterk_Concept.shp,DWK_IDENT,-1,-1;POLDERNAAM 'POLDERNAAM' true true false 254 Text 0 0 ,First,#,G:\01_Componenten\01_Beheer\03_Objectdata_HHNK\02_Waterkeringen\02_Regionale waterkeringen\01_Legger_en_Beheerregister\DWK_Reg_waterk_Concept.shp,POLDERNAAM,-1,-1;DWK_SOORT 'DWK_SOORT' true true false 254 Text 0 0 ,First,#,G:\01_Componenten\01_Beheer\03_Objectdata_HHNK\02_Waterkeringen\02_Regionale waterkeringen\01_Legger_en_Beheerregister\DWK_Reg_waterk_Concept.shp,DWK_SOORT,-1,-1;GDR_IDENT 'GDR_IDENT' true true false 254 Text 0 0 ,First,#,G:\01_Componenten\01_Beheer\03_Objectdata_HHNK\02_Waterkeringen\02_Regionale waterkeringen\01_Legger_en_Beheerregister\DWK_Reg_waterk_Concept.shp,GDR_IDENT,-1,-1;GDR_IDENT2 'GDR_IDENT2' true true false 254 Text 0 0 ,First,#,G:\01_Componenten\01_Beheer\03_Objectdata_HHNK\02_Waterkeringen\02_Regionale waterkeringen\01_Legger_en_Beheerregister\DWK_Reg_waterk_Concept.shp,GDR_IDENT2,-1,-1;COUNT_OVK 'COUNT_OVK' true true false 9 Long 0 9 ,First,#,G:\01_Componenten\01_Beheer\03_Objectdata_HHNK\02_Waterkeringen\02_Regionale waterkeringen\01_Legger_en_Beheerregister\DWK_Reg_waterk_Concept.shp,COUNT_OVK,-1,-1;GEDAAN 'GEDAAN' true true false 50 Text 0 0 ,First,#,G:\01_Componenten\01_Beheer\03_Objectdata_HHNK\02_Waterkeringen\02_Regionale waterkeringen\01_Legger_en_Beheerregister\DWK_Reg_waterk_Concept.shp,GEDAAN,-1,-1;DWK_NAAM 'DWK_NAAM' true true false 50 Text 0 0 ,First,#,G:\01_Componenten\01_Beheer\03_Objectdata_HHNK\02_Waterkeringen\02_Regionale waterkeringen\01_Legger_en_Beheerregister\DWK_Reg_waterk_Concept.shp,DWK_NAAM,-1,-1;Opmerking 'Opmerking' true true false 50 Text 0 0 ,First,#,G:\01_Componenten\01_Beheer\03_Objectdata_HHNK\02_Waterkeringen\02_Regionale waterkeringen\01_Legger_en_Beheerregister\DWK_Reg_waterk_Concept.shp,Opmerking,-1,-1;Lengte 'Lengte' true true false 8 Float 2 7 ,First,#,G:\01_Componenten\01_Beheer\03_Objectdata_HHNK\02_Waterkeringen\02_Regionale waterkeringen\01_Legger_en_Beheerregister\DWK_Reg_waterk_Concept.shp,Lengte,-1,-1" # "Database Connections\Connection to srv79d1_INTWIS2.sde\INTWIS2.HHNK_DWK_REG_WATERK_CONCEPT"DeleteField G:\02_Werkplaatsen\11_KER\Toetsing_WK\03_Toetsing_RWK\Toetsing_2009_2012\02_Projecten\10_Kades_DAM\04_Uitvoering\DAM_Input_shapes\Overige\RWK_lijn.shp DWK_IDENT;POLDERNAAM;DWK_SOORT;GDR_IDENT;GDR_IDENT2;COUNT_OVK;GEDAAN;DWK_NAAM;OPMERKING;LENGTE;SHAPE_LEN G:\02_Werkplaatsen\11_KER\Toetsing_WK\03_Toetsing_RWK\Toetsing_2009_2012\02_Projecten\10_Kades_DAM\04_Uitvoering\DAM_Input_shapes\Overige\RWK_lijn.shpIntersect "RWK_lijn_org #;Wegverharding_vlak_Union #" G:\02_Werkplaatsen\11_KER\Toetsing_WK\03_Toetsing_RWK\Toetsing_2009_2012\02_Projecten\10_Kades_DAM\04_Uitvoering\DAM_Input_shapes\TrafficLoad\Output\RWK_WVH_int.shp ALL # INPUTMultipartToSinglepart RWK_WVH_int G:\02_Werkplaatsen\11_KER\Toetsing_WK\03_Toetsing_RWK\Toetsing_2009_2012\02_Projecten\10_Kades_DAM\04_Uitvoering\DAM_Input_shapes\TrafficLoad\Trafficload.shpAddField G:\02_Werkplaatsen\11_KER\Toetsing_WK\03_Toetsing_RWK\Toetsing_2009_2012\02_Projecten\10_Kades_DAM\04_Uitvoering\DAM_Input_shapes\TrafficLoad\Trafficload.shp TRAFLOAD DOUBLE # # # # NON_NULLABLE NON_REQUIRED # G:\02_Werkplaatsen\11_KER\Toetsing_WK\03_Toetsing_RWK\Toetsing_2009_2012\02_Projecten\10_Kades_DAM\04_Uitvoering\DAM_Input_shapes\TrafficLoad\Trafficload.shpCalculateField G:\02_Werkplaatsen\11_KER\Toetsing_WK\03_Toetsing_RWK\Toetsing_2009_2012\02_Projecten\10_Kades_DAM\04_Uitvoering\DAM_Input_shapes\TrafficLoad\Trafficload.shp TRAFLOAD Trafload VB "Dim Trafload +Trafload = 5 +If [CODE] = "W1" Then Trafload = 13 +If [CODE] = "W2" Then Trafload = 13 +If [CODE] = "W3" Then Trafload = 13 +" G:\02_Werkplaatsen\11_KER\Toetsing_WK\03_Toetsing_RWK\Toetsing_2009_2012\02_Projecten\10_Kades_DAM\04_Uitvoering\DAM_Input_shapes\TrafficLoad\Trafficload.shpDeleteField G:\02_Werkplaatsen\11_KER\Toetsing_WK\03_Toetsing_RWK\Toetsing_2009_2012\02_Projecten\10_Kades_DAM\04_Uitvoering\DAM_Input_shapes\TrafficLoad\Trafficload.shp FID_RWK_li;OBJECTID;FID_Wegver;FID_Wegv_1;Id;FID_Wegv_2;OBJECTID_1;BOVENWATER;TRAJECT;VLIEGJAAR;TYPEKERING;SHAPE_AREA;SHAPE_LEN;ORIG_FID G:\02_Werkplaatsen\11_KER\Toetsing_WK\03_Toetsing_RWK\Toetsing_2009_2012\02_Projecten\10_Kades_DAM\04_Uitvoering\DAM_Input_shapes\TrafficLoad\Trafficload.shp20120105162557002012010516255700{B036FD89-A8BD-45BE-9F08-3C085A96A4C0}\\srv57d1\geo_info\02_Werkplaatsen\11_KER\Toetsing_WK\03_Toetsing_RWK\Toetsing_2009_2012\02_Projecten\10_Kades_DAM\04_Uitvoering\DAM_Input_shapes\DataLevering\20120119\TrafficloadREQUIRED: The name of an organization or individual that developed the data set.REQUIRED: The date when the data set is published or otherwise made available for release.TrafficloadTrafficloadvector digital dataMicrosoft Windows XP Version 5.1 (Build 2600) Service Pack 3; ESRI ArcCatalog 9.3.1.3500nlREQUIRED: A brief narrative summary of the data set.REQUIRED: A summary of the intentions with which the data set was developed.REQUIRED: The basis on which the time period of content information is determined.REQUIRED: The year (and optionally month, or month and day) for which the data set corresponds to the ground.REQUIRED: The state of the data set.REQUIRED: The frequency with which changes and additions are made to the data set after the initial data set is completed.4.6325055.30247453.19545152.372009104536.264000149201.145500487271.151200578635.098000REQUIRED: Reference to a formally registered thesaurus or a similar authoritative source of theme keywords.REQUIRED: Common-use word or phrase used to describe the subject of the data set.REQUIRED: Restrictions and legal prerequisites for accessing the data set.REQUIRED: Restrictions and legal prerequisites for using the data set after access is granted.Shapefilefile://\\srv57d1\geo_info\02_Werkplaatsen\11_KER\Toetsing_WK\03_Toetsing_RWK\Toetsing_2009_2012\02_Projecten\10_Kades_DAM\04_Uitvoering\DAM_Input_shapes\DataLevering\20120119\TrafficloadLocal Area Network0020,000Shapefile\\srv57d1\geo_info\02_Werkplaatsen\11_KER\Toetsing_WK\03_Toetsing_RWK\Toetsing_2009_2012\02_Projecten\10_Kades_DAM\04_Uitvoering\DAM_Input_shapes\DataLevering\20120119\TrafficloadBeslist niet beschikbaar voor derdenHHNKInhoudelijk contactpersoonJan-Willem EversHHNKEigenaarHHNKHoogheemraadschap HollandsNoorderKwartier07258282820725827010Postbus 2501700 AGHeerhugowaardNederlandBevelandseweg 11703 AZHeerhugowaardNederlandHoogheemraadschap Hollands NoorderkwartierNederlandsISO 8859-1Gebruik als ondergrondWeergave van een waterkerende en / of scheidende, kunstmatige of natuurlijke hoogte of hooggelegen gronden inclusief de daarin aanwezige waterkerende elementen. Het is nog een concept lijn waar nog verschillende verbeteringen in moeten worden doorgevoerd1:1000Volledige topologie (G1)NAPRD_NewD_AmersfoortDouble_StereographicBessel_1841ActueelNederland - Hollands Noorderkwartier, Boven het IJ104536,264487271,1514,63352,372149201,146578635,0985,30253,1957-1-2011Actueel0.0000.000ActueelDWK_Reg_waterk_Conceptkeringlijn regionaal concept08-06-200907-01-2011Hoogheemraadschap Hollands NoorderkwartierDigitaliserenPositional AccuracyAbsolute horizontal accuracyrmseroot of mean square errorHet is een interpretatie van de werkelijkheid.CompletenessOmissionPercentage of entities missingPercentage of entities missingAls de uitgangspunten duidelijk zijn, is er iets te zeggen over de volledigheid.ShapefileArcGIS, ArcView, IRIS KeringenTrafficloadFIDFIDObject ID40ShapeShapeGeometry00FID_RWK_liFID_RWK_liLong Integer99OBJECTIDOBJECTIDDouble10100FID_WegverFID_WegverLong Integer99FID_Wegv_1FID_Wegv_1Long Integer99IdIdLong Integer66FID_Wegv_2FID_Wegv_2Long Integer99OBJECTID_1OBJECTID_1Double10100CODECODEString2540BOVENWATERBOVENWATERLong Integer55TRAJECTTRAJECTString1000VLIEGJAARVLIEGJAARString100TYPEKERINGTYPEKERINGString200SHAPE_AREASHAPE_AREADouble1900SHAPE_LENSHAPE_LENDouble1900ORIG_FIDORIG_FIDLong Integer99Dataset copied.20090428Dataset copied.20090429Dataset copied.20090511Dataset copied.20090511Dataset copied.20090511Dataset copied.G:\01_Componenten\02_Projecten\030102_Legger_RWK\05_DWK_RWK\Data_constr\DWK_Reg_waterk_Concept_11_05_09_backup420090512Dataset copied.20090519Dataset copied.20090519Dataset copied.20090519Dataset copied.20090519Dataset copied.20090519Dataset copied.20090520Dataset copied.20090520Dataset copied.20090520Dataset copied.20090520Dataset copied.20090520Dataset copied.20090520Dataset copied.20090520Dataset copied.G:\01_Componenten\02_Projecten\030102_Legger_RWK\05_DWK_RWK\Data_constr\DWK_Reg_waterk_Concept_20_05_0920090609Dataset copied.20091208Dataset moved.G:\01_Componenten\02_Projecten\030102_Legger_RWK\05_DWK_RWK\DWK_Reg_waterk_Concept_08_12_092010042214412000Dataset copied.2010063007544900Dataset copied.2010072809173900Dataset copied.2010111514092900Dataset copied.2011010611090400Dataset copied.2011010614075200Dataset copied.G:\01_Componenten\02_Projecten\030102_Legger_RWK\05_DWK_RWK\DWK_Reg_waterk_Concept_06_01_112011010615152300Dataset copied.Server=srv79d1; Service=5163; User=keringen; Version=SDE.DEFAULT2011121212264200Dataset copied.2011121915584700Dataset copied.G:\02_Werkplaatsen\11_KER\Toetsing_WK\03_Toetsing_RWK\Toetsing_2009_2012\02_Projecten\10_Kades_DAM\04_Uitvoering\DAM_Input_shapes\TrafficLoad\Trafficload2012011911210500Microsoft Windows XP Version 5.1 (Build 2600) Service Pack 3; ESRI ArcCatalog 9.3.1.3500Trafficload104536.264149201.1455578635.098487271.151214.6325055.30247453.19545152.3720091nlFGDC Content Standards for Digital Geospatial MetadataFGDC-STD-001-1998local timeREQUIRED: The person responsible for the metadata information.REQUIRED: The organization responsible for the metadata information.REQUIRED: The mailing and/or physical address for the organization or individual.REQUIRED: The city of the address.REQUIRED: The state or province of the address.REQUIRED: The ZIP or other postal code of the address.REQUIRED: The telephone number by which individuals can speak to the organization or individual.20120105http://www.esri.com/metadata/esriprof80.htmlESRI Metadata ProfileISO 19115 Geographic Information - MetadataDIS_ESRI1.0datasetDownloadable Data0,0000,000VectorSimplePolylineFALSE0FALSEFALSEString0GCS_AmersfoortRD_Newcoordinate pairmeters0.0000000.000000Double Stereographic5.38763952.1561610.999908155000.000000463000.000000D_AmersfoortBessel_18416377397.155000299.152813Explicit elevation coordinate included with horizontal coordinates1.000000RD_New0TrafficloadFeature Class0FIDFIDOID400Internal feature number.ESRISequential unique whole numbers that are automatically generated.OBJECTIDOBJECTIDNumber10Internal feature number.ESRISequential unique whole numbers that are automatically generated.FID_RWK_liFID_RWK_liNumber9ShapeShapeGeometry000Feature geometry.ESRICoordinates defining the features.FID_WegverFID_WegverNumber9FID_Wegv_1FID_Wegv_1Number9IdIdNumber6FID_Wegv_2FID_Wegv_2Number9OBJECTID_1OBJECTID_1Number10CODECODEString254BOVENWATERBOVENWATERNumber5TRAJECTTRAJECTString100VLIEGJAARVLIEGJAARString10TYPEKERINGTYPEKERINGString20SHAPE_AREASHAPE_AREAFloat19Area of feature in internal units squared.ESRIPositive real numbers that are automatically generated.11SHAPE_LENSHAPE_LENFloat1911ORIG_FIDORIG_FIDNumber92DWaterkeringennvanslochterenFalse20120105 Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/TestData/HHNKShapeFiles/Crosssection.dbf =================================================================== diff -u Binary files differ Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DataPluginImporterCsvTests.cs =================================================================== diff -u -r4214 -r4511 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DataPluginImporterCsvTests.cs (.../DataPluginImporterCsvTests.cs) (revision 4214) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DataPluginImporterCsvTests.cs (.../DataPluginImporterCsvTests.cs) (revision 4511) @@ -21,6 +21,7 @@ using System; using System.Collections.Generic; +using System.IO; using System.Linq; using Deltares.Dam.Data; using Deltares.Dam.Data.DataPlugins; @@ -33,7 +34,8 @@ [TestFixture] public class DataPluginImporterCsvTests { - const string directoryWithCsvFiles = @"..\..\..\..\..\data\Dam\Waterboards\Groot Salland\Binnenwaarts\"; + string directoryWithCsvFiles = Path.Combine(Directory.GetCurrentDirectory(), @"TestData\GrootSallandBinnenwaarts\"); + //const string directoryWithCsvFiles = @"..\..\..\..\..\data\Dam\Waterboards\Groot Salland\Binnenwaarts\"; private const string location18_6Id = "dwp18_6"; private const string segment05_4Id = "segment_dijkring10_dwp05_4"; private const string surfaceline40_0Id = "dijkring10_dwp40_0"; Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/TestData/HHNKShapeFiles/Crosssection.shp =================================================================== diff -u Binary files differ Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/TestData/HHNKShapeFiles/TrafficLoad.sbx =================================================================== diff -u Binary files differ Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/IO/BackwardCompatibility.cs =================================================================== diff -u -r4070 -r4511 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/IO/BackwardCompatibility.cs (.../BackwardCompatibility.cs) (revision 4070) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/IO/BackwardCompatibility.cs (.../BackwardCompatibility.cs) (revision 4511) @@ -134,15 +134,21 @@ { foreach (Scenario scenario in location.Scenarios) { - scenario.HeadPl3 = value; + if (scenario.HeadPl3 == null || value != null) + { + scenario.HeadPl3 = value; + } } } private static void UpdateHeadPl4(Location location, double? value) { foreach (Scenario scenario in location.Scenarios) { - scenario.HeadPl4 = value; + if (scenario.HeadPl4 == null || value != null) + { + scenario.HeadPl4 = value; + } } } Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/TestData/HHNKShapeFiles/Polderlevel.sbx =================================================================== diff -u Binary files differ Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/TestData/HHNKShapeFiles/Polderlevel.shp =================================================================== diff -u Binary files differ Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/TestData/HHNKShapeFiles/TrafficLoad.sbn =================================================================== diff -u Binary files differ Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/TestData/HHNKShapeFiles/Crosssection.sbn =================================================================== diff -u Binary files differ Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/TestData/HHNKShapeFiles/TrafficLoad.shp =================================================================== diff -u Binary files differ Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/TestData/HHNKShapeFiles/Polderlevel.shp.xml =================================================================== diff -u --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/TestData/HHNKShapeFiles/Polderlevel.shp.xml (revision 0) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/TestData/HHNKShapeFiles/Polderlevel.shp.xml (revision 4511) @@ -0,0 +1,3 @@ + + +2012011911444900FALSE20110930123100002011093012310000Union "DAM_output\Peilafwijkingen_8_7_2011 #;DAM_output\Peilgebieden_8_7_2011 #" G:\02_Werkplaatsen\11_KER\Toetsing_WK\03_Toetsing_RWK\Toetsing_2009_2012\02_Projecten\10_Kades_DAM\04_Uitvoering\TEST_DAM_Input_shapes\Peilgebieden_Output\Peilafwijking_8_7_2011_Union.shp ALL # GAPSAddField G:\02_Werkplaatsen\11_KER\Toetsing_WK\03_Toetsing_RWK\Toetsing_2009_2012\02_Projecten\10_Kades_DAM\04_Uitvoering\TEST_DAM_Input_shapes\Peilgebieden_Output\Peilafwijking_8_7_2011_Union.shp PLLow_FNL DOUBLE # # # # NON_NULLABLE NON_REQUIRED # G:\02_Werkplaatsen\11_KER\Toetsing_WK\03_Toetsing_RWK\Toetsing_2009_2012\02_Projecten\10_Kades_DAM\04_Uitvoering\TEST_DAM_Input_shapes\Peilgebieden_Output\Peilafwijking_8_7_2011_Union.shpAddField G:\02_Werkplaatsen\11_KER\Toetsing_WK\03_Toetsing_RWK\Toetsing_2009_2012\02_Projecten\10_Kades_DAM\04_Uitvoering\TEST_DAM_Input_shapes\Peilgebieden_Output\Peilafwijking_8_7_2011_Union.shp PLHigh_FNL DOUBLE # # # # NON_NULLABLE NON_REQUIRED # G:\02_Werkplaatsen\11_KER\Toetsing_WK\03_Toetsing_RWK\Toetsing_2009_2012\02_Projecten\10_Kades_DAM\04_Uitvoering\TEST_DAM_Input_shapes\Peilgebieden_Output\Peilafwijking_8_7_2011_Union.shpDeleteField G:\02_Werkplaatsen\11_KER\Toetsing_WK\03_Toetsing_RWK\Toetsing_2009_2012\02_Projecten\10_Kades_DAM\04_Uitvoering\TEST_DAM_Input_shapes\Peilgebieden_Output\PolderLevel.shp FID_Peilaf;GPGIDENT;PLHigh;PLLow;FID_Peilge;GPGIDENT_1;PLHigh_1;PLLow_1 G:\02_Werkplaatsen\11_KER\Toetsing_WK\03_Toetsing_RWK\Toetsing_2009_2012\02_Projecten\10_Kades_DAM\04_Uitvoering\TEST_DAM_Input_shapes\Peilgebieden_Output\PolderLevel.shpAddField G:\02_Werkplaatsen\11_KER\Toetsing_WK\03_Toetsing_RWK\Toetsing_2009_2012\02_Projecten\10_Kades_DAM\04_Uitvoering\TEST_DAM_Input_shapes\Peilgebieden_Output\PolderLevel.shp PLLow DOUBLE # # # # NON_NULLABLE NON_REQUIRED # G:\02_Werkplaatsen\11_KER\Toetsing_WK\03_Toetsing_RWK\Toetsing_2009_2012\02_Projecten\10_Kades_DAM\04_Uitvoering\TEST_DAM_Input_shapes\Peilgebieden_Output\PolderLevel.shpAddField G:\02_Werkplaatsen\11_KER\Toetsing_WK\03_Toetsing_RWK\Toetsing_2009_2012\02_Projecten\10_Kades_DAM\04_Uitvoering\TEST_DAM_Input_shapes\Peilgebieden_Output\PolderLevel.shp PLHigh DOUBLE # # # # NON_NULLABLE NON_REQUIRED # G:\02_Werkplaatsen\11_KER\Toetsing_WK\03_Toetsing_RWK\Toetsing_2009_2012\02_Projecten\10_Kades_DAM\04_Uitvoering\TEST_DAM_Input_shapes\Peilgebieden_Output\PolderLevel.shpDeleteField G:\02_Werkplaatsen\11_KER\Toetsing_WK\03_Toetsing_RWK\Toetsing_2009_2012\02_Projecten\10_Kades_DAM\04_Uitvoering\TEST_DAM_Input_shapes\Peilgebieden_Output\PolderLevel.shp PLLow_FNL;PLHigh_FNL G:\02_Werkplaatsen\11_KER\Toetsing_WK\03_Toetsing_RWK\Toetsing_2009_2012\02_Projecten\10_Kades_DAM\04_Uitvoering\TEST_DAM_Input_shapes\Peilgebieden_Output\PolderLevel.shp{6385AE7B-E355-4297-A5DD-7EFF1AA7E559}Microsoft Windows XP Version 5.1 (Build 2600) Service Pack 3; ESRI ArcCatalog 9.3.1.3500nlREQUIRED: A brief narrative summary of the data set.REQUIRED: A summary of the intentions with which the data set was developed.REQUIRED: The name of an organization or individual that developed the data set.REQUIRED: The date when the data set is published or otherwise made available for release.PolderLevelPolderLevelvector digital data\\srv57d1\geo_info\02_Werkplaatsen\11_KER\Toetsing_WK\03_Toetsing_RWK\Toetsing_2009_2012\02_Projecten\10_Kades_DAM\04_Uitvoering\DAM_Input_shapes\DataLevering\20120119\PolderLevelREQUIRED: The basis on which the time period of content information is determined.REQUIRED: The year (and optionally month, or month and day) for which the data set corresponds to the ground.REQUIRED: The state of the data set.REQUIRED: The frequency with which changes and additions are made to the data set after the initial data set is completed.4.6063365.29925353.18291152.371827102772.192000148981.836000487269.260000577240.000000REQUIRED: Reference to a formally registered thesaurus or a similar authoritative source of theme keywords.REQUIRED: Common-use word or phrase used to describe the subject of the data set.REQUIRED: Restrictions and legal prerequisites for accessing the data set.REQUIRED: Restrictions and legal prerequisites for using the data set after access is granted.ShapefileMicrosoft Windows XP Version 5.1 (Build 2600) Service Pack 3; ESRI ArcCatalog 9.3.1.3500PolderLevel102772.192148981.836577240487269.2614.6063365.29925353.18291152.3718271nlFGDC Content Standards for Digital Geospatial MetadataFGDC-STD-001-1998local timeREQUIRED: The person responsible for the metadata information.REQUIRED: The organization responsible for the metadata information.REQUIRED: The mailing and/or physical address for the organization or individual.REQUIRED: The city of the address.REQUIRED: The state or province of the address.REQUIRED: The ZIP or other postal code of the address.REQUIRED: The telephone number by which individuals can speak to the organization or individual.20110930http://www.esri.com/metadata/esriprof80.htmlESRI Metadata ProfileISO 19115 Geographic Information - MetadataDIS_ESRI1.0datasetHoogheemraadschap Hollands NoorderkwartierNederlandsISO 8859-1Gebruik als ondergrondNAPRD_NewD_AmersfoortDouble_StereographicBessel_1841ActueelNederland - Hollands Noorderkwartier, Boven het IJ en Texel102772,192487269,2604,60652,372148981,836577240,0005,29953,183Actueel0.0000.000ActueelBeslist niet beschikbaar voor derdenHHNK\\srv57d1\geo_info\02_Werkplaatsen\11_KER\Toetsing_WK\03_Toetsing_RWK\Toetsing_2009_2012\02_Projecten\10_Kades_DAM\04_Uitvoering\DAM_Input_shapes\DataLevering\20120119\PolderLevelPeilafwijking_8_7_2011_UnionShapefilePolderLevelFIDFIDObject ID40ShapeShapeGeometry00FID_PeilafFID_PeilafLong Integer99GPGIDENTGPGIDENTString240PLHighPLHighDouble1900PLLowPLLowDouble1900FID_PeilgeFID_PeilgeLong Integer99GPGIDENT_1GPGIDENT_1String240PLHigh_1PLHigh_1Double1900PLLow_1PLLow_1Double1900PLLow_FNLPLLow_FNLDouble1900PLHigh_FNLPLHigh_FNLDouble190030-09-2011Downloadable Data7,6037,603002file://\\srv57d1\geo_info\02_Werkplaatsen\11_KER\Toetsing_WK\03_Toetsing_RWK\Toetsing_2009_2012\02_Projecten\10_Kades_DAM\04_Uitvoering\DAM_Input_shapes\DataLevering\20120119\PolderLevelLocal Area Network7,603ShapefileVectorSimplePolygonFALSE4393TRUEFALSEG-polygon4393GCS_AmersfoortRD_Newcoordinate pairmeters0.0000000.000000Double Stereographic5.38763952.1561610.999908155000.000000463000.000000D_AmersfoortBessel_18416377397.155000299.152813RD_New4393PolderLevelFeature Class4393FIDFIDOID400Internal feature number.ESRISequential unique whole numbers that are automatically generated.ShapeShapeGeometry000Feature geometry.ESRICoordinates defining the features.FID_PeilafFID_PeilafNumber9GPGIDENTGPGIDENTString24PLHighPLHighFloat1911PLLowPLLowFloat1911FID_PeilgeFID_PeilgeNumber9GPGIDENT_1GPGIDENT_1String24PLHigh_1PLHigh_1Float1911PLLow_1PLLow_1Float1911PLLow_FNLPLLow_FNLFloat1911PLHigh_FNLPLHigh_FNLFloat19112D20110930Dataset copied.2011093012294400Dataset moved.G:\02_Werkplaatsen\11_KER\Toetsing_WK\03_Toetsing_RWK\Toetsing_2009_2012\02_Projecten\10_Kades_DAM\04_Uitvoering\TEST_DAM_Input_shapes\PolderLevel\Peilgebieden_Output\PolderLevel2011093015322800Dataset copied.G:\02_Werkplaatsen\11_KER\Toetsing_WK\03_Toetsing_RWK\Toetsing_2009_2012\02_Projecten\10_Kades_DAM\04_Uitvoering\DAM_Input_shapes\PolderLevel\PolderLevel2012011911444900 Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/LoadCompatiblityTest.cs =================================================================== diff -u -r4236 -r4511 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/LoadCompatiblityTest.cs (.../LoadCompatiblityTest.cs) (revision 4236) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/LoadCompatiblityTest.cs (.../LoadCompatiblityTest.cs) (revision 4511) @@ -78,7 +78,7 @@ [Category("Integration")] public void CanLoadVersion_1_3_3_1() { - const string projectFilenameHhnk = @"..\..\..\..\..\data\Dam\Versions\V 1.3.3.1\HHNK\TPL_Hempolder.damx"; + const string projectFilenameHhnk = @"..\..\..\..\..\data\Dam\V 1.3.3.1\HHNK\TPL_Hempolder.damx"; using (DamProjectData projectData = ProjectLoader.LoadProjectData(projectFilenameHhnk)) { Assert.AreEqual(DamProjectType.AssessOld, projectData.DamProjectType); @@ -93,7 +93,7 @@ [Category("Integration")] public void CanLoadVersion_1_5_1_7_ScenariosPLLineParameters() { - const string projectFilenameTutorialDesign = @"..\..\..\..\..\data\Dam\Versions\V 1.5.1.7\Tutorial Design\DAM Tutorial Design (Old 1.5.1.7).damx"; + const string projectFilenameTutorialDesign = @"..\..\..\..\..\data\Dam\V 1.5.1.7\Tutorial Design\DAM Tutorial Design (Old 1.5.1.7).damx"; using (DamProjectData projectData = ProjectLoader.LoadProjectData(projectFilenameTutorialDesign)) { foreach (Location location in projectData.Locations) @@ -111,7 +111,7 @@ [Category("Integration")] public void CanLoadVersion_1_5_2_1() { - const string fullProjectFilename = @"..\..\..\..\..\data\Dam\Versions\V 1.5.2.1\HHNK\TPL_Hempolder.damx"; + const string fullProjectFilename = @"..\..\..\..\..\data\Dam\V 1.5.2.1\HHNK\TPL_Hempolder.damx"; using (DamProjectData projectData = ProjectLoader.LoadProjectData(fullProjectFilename)) { Assert.AreEqual(DamProjectType.AssessOld, projectData.DamProjectType); @@ -124,7 +124,7 @@ [TestCase(@"HHNK\TPL_Hempolder.damx", @"HHNK\TPL_Hempolder0.soilmaterials.mdb", "TPL_Hempolder_0100")] public void CanLoadVersion_14_1_1_14(string projectFilename, string expectedSoilbaseName, string locationName) { - const string dataFolder = @"..\..\..\..\..\data\Dam\Versions\V 14.1.1.14\"; + const string dataFolder = @"..\..\..\..\..\data\Dam\V 14.1.1.14\"; string fullProjectFilename = Path.Combine(dataFolder, projectFilename); using (DamProjectData projectData = ProjectLoader.LoadProjectData(fullProjectFilename)) @@ -156,7 +156,7 @@ // [TestCase(@"HHNKRegionalDesign\HHNK HemPolder Regional Design.damx", @"HHNKRegionalDesign\HHNK HemPolder Regional Design0.soilmaterials.mdb", "TPL_Hempolder_0100")] #Bka: this is a Bishop project which is not yet supported for Marcrostability kernel (only UpliftVan) public void CanLoadVersion_15_1_1_3(string projectFilename, string expectedSoilbaseName, string locationName) { - const string dataFolder = @"..\..\..\..\..\data\Dam\Versions\V 15.1.1.3\"; + const string dataFolder = @"..\..\..\..\..\data\Dam\V 15.1.1.3\"; string fullProjectFilename = Path.Combine(dataFolder, projectFilename); using (DamProjectData projectData = ProjectLoader.LoadProjectData(fullProjectFilename)) @@ -199,7 +199,7 @@ // [TestCase(@"HHNKRegionalDesign\HHNK HemPolder Regional Design.damx", @"HHNKRegionalDesign\HHNK HemPolder Regional Design0.soilmaterials.mdb", "TPL_Hempolder_0100")] #Bka: this is a Bishop project which is not yet supported for Marcrostability kernel (only UpliftVan) public void CanLoadVersion_18_1_3(string projectFilename, string expectedSoilbaseName, string locationName) { - const string dataFolder = @"..\..\..\..\..\data\Dam\Versions\V 18.1.3\"; + const string dataFolder = @"..\..\..\..\..\data\Dam\V 18.1.3\"; string fullProjectFilename = Path.Combine(dataFolder, projectFilename); using (DamProjectData projectData = ProjectLoader.LoadProjectData(fullProjectFilename)) @@ -242,7 +242,7 @@ [TestCase(@"HHNKRegionalDesign\HHNK HemPolder Regional Design.damx", @"HHNKRegionalDesign\HHNK HemPolder Regional Design0.soilmaterials.mdb", "TPL_Hempolder_0100")] public void CanLoadVersion_19_1_1(string projectFilename, string expectedSoilbaseName, string locationName) { - const string dataFolder = @"..\..\..\..\..\data\Dam\Versions\V 19.1.1\"; + const string dataFolder = @"..\..\..\..\..\data\Dam\V 19.1.1\"; string fullProjectFilename = Path.Combine(dataFolder, projectFilename); using (DamProjectData projectData = ProjectLoader.LoadProjectData(fullProjectFilename)) @@ -273,10 +273,10 @@ [Test] [Category("Integration")] - [TestCase(@"..\..\..\..\..\data\Dam\Versions\V 15.1.1.3\HHNKRegionalDesign\", @"HHNK HemPolder Regional Design - Calculated.damx")] - [TestCase(@"..\..\..\..\..\data\Dam\Versions\V 18.1.3\HHNKRegionalDesign\", @"HHNK HemPolder Regional Design - Calculated.damx")] - [TestCase(@"..\..\..\..\..\data\Dam\Versions\V 15.1.1.3\TutorialDesign\", @"DAM Tutorial Design - Calculated.damx")] - [TestCase(@"..\..\..\..\..\data\Dam\Versions\V 18.1.3\TutorialDesign\", @"DAM Tutorial Design - Calculated.damx")] + [TestCase(@"..\..\..\..\..\data\Dam\V 15.1.1.3\HHNKRegionalDesign\", @"HHNK HemPolder Regional Design - Calculated.damx")] + [TestCase(@"..\..\..\..\..\data\Dam\V 18.1.3\HHNKRegionalDesign\", @"HHNK HemPolder Regional Design - Calculated.damx")] + [TestCase(@"..\..\..\..\..\data\Dam\V 15.1.1.3\TutorialDesign\", @"DAM Tutorial Design - Calculated.damx")] + [TestCase(@"..\..\..\..\..\data\Dam\V 18.1.3\TutorialDesign\", @"DAM Tutorial Design - Calculated.damx")] public void GivenOldProjectFileWithCalculationResultsWhenLoadingThisFileThenResultsAreNotLoaded( string dataFolder, string projectFilename) { @@ -300,7 +300,7 @@ [Ignore("project uses Bishop which is not yet supported for MacroStability kernel.")] public void CanSaveAndLoadCurrentVersion() { - const string projectFilenameHhnk = @"..\..\..\..\..\data\Dam\Versions\V 15.1.1.3\HHNKRegionalDesign\HHNK HemPolder Regional Design.damx"; + const string projectFilenameHhnk = @"..\..\..\..\..\data\Dam\V 15.1.1.3\HHNKRegionalDesign\HHNK HemPolder Regional Design.damx"; const string projectFilenameCurrentVersion = @".\TPL_HempolderCurrent.damx"; // HHNK (Hollands Noorderkwartier) Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/TestData/HHNKShapeFiles/Crosssection.shx =================================================================== diff -u Binary files differ Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.BenchmarkTests/DamPipingBenchmarkTest.cs =================================================================== diff -u -r4377 -r4511 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.BenchmarkTests/DamPipingBenchmarkTest.cs (.../DamPipingBenchmarkTest.cs) (revision 4377) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.BenchmarkTests/DamPipingBenchmarkTest.cs (.../DamPipingBenchmarkTest.cs) (revision 4511) @@ -44,7 +44,7 @@ [Test] public void Bm01OneAquiferOneLayer() { - const string projectFilename = @"..\..\..\..\..\data\Dam\Benchmarks\Piping\Test 1\Integratietest piping 1.damx"; + const string projectFilename = @"..\..\..\..\..\data\Benchmarks\Piping\Test 1\Integratietest piping 1.damx"; List allCalculationresults = ComputeProject(projectFilename, PipingModelType.Bligh, 0); var expectedPipingFactor = 0.5208; // This is just taken from the calculation result itself @@ -96,7 +96,7 @@ [Test] public void Bm02OneAquiferTwoLayers() { - var projectFilename = @"..\..\..\..\..\data\Dam\Benchmarks\Piping\Test 2\Integratietest piping 2.damx"; + var projectFilename = @"..\..\..\..\..\data\Benchmarks\Piping\Test 2\Integratietest piping 2.damx"; List allCalculationresults = ComputeProject(projectFilename, PipingModelType.Bligh, 0); var expectedPipingFactor = 0.5208; // This is just taken from the calculation result itself @@ -115,7 +115,7 @@ [Test] public void Bm03OneAquiferThreeLayers() { - var projectFilename = @"..\..\..\..\..\data\Dam\Benchmarks\Piping\Test 3\Integratietest piping 3.damx"; + var projectFilename = @"..\..\..\..\..\data\Benchmarks\Piping\Test 3\Integratietest piping 3.damx"; List allCalculationresults = ComputeProject(projectFilename, PipingModelType.Bligh, 0); var expectedPipingFactor = 0.5208; // This is just taken from the calculation result itself @@ -134,7 +134,7 @@ [Test] public void Bm04TwoAquifersOneLayer() { - var projectFilename = @"..\..\..\..\..\data\Dam\Benchmarks\Piping\Test 4\Integratietest piping 4.damx"; + var projectFilename = @"..\..\..\..\..\data\Benchmarks\Piping\Test 4\Integratietest piping 4.damx"; List allCalculationresults = ComputeProject(projectFilename, PipingModelType.Bligh, 0); var expectedPipingFactor = 0.5208; // This is just taken from the calculation result itself @@ -153,7 +153,7 @@ [Test] public void Bm05TwoAquifersTwoLayers() { - var projectFilename = @"..\..\..\..\..\data\Dam\Benchmarks\Piping\Test 5\Integratietest piping 5.damx"; + var projectFilename = @"..\..\..\..\..\data\Benchmarks\Piping\Test 5\Integratietest piping 5.damx"; List allCalculationresults = ComputeProject(projectFilename, PipingModelType.Bligh, 0); var expectedPipingFactor = 0.5208; // This is just taken from the calculation result itself @@ -232,7 +232,7 @@ public void Bm06TwoAquifersTwoLayersWithDifferentDistanceToEntryPoint(double distanceToEntryPoint, double expectedWtiPipingFactor, double expectedSeepageLength, double expectedHc, double expectedCCreep) { - var projectFilename = @"..\..\..\..\..\data\Dam\Benchmarks\Piping\Test 5\Integratietest piping 5.damx"; + var projectFilename = @"..\..\..\..\..\data\Benchmarks\Piping\Test 5\Integratietest piping 5.damx"; List allCalculationresults = ComputeProject(projectFilename, PipingModelType.Bligh, distanceToEntryPoint); var expectedPipingFactor = 0.5208; // This is just taken from the calculation result itself Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/TestData/HHNKShapeFiles/Polderlevel.dbf =================================================================== diff -u Binary files differ Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/TestData/HHNKShapeFiles/Polderlevel.shx =================================================================== diff -u Binary files differ Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/TestData/HHNKShapeFiles/TrafficLoad.dbf =================================================================== diff -u Binary files differ Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/TestData/HHNKShapeFiles/Crosssection.shp.xml =================================================================== diff -u --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/TestData/HHNKShapeFiles/Crosssection.shp.xml (revision 0) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/TestData/HHNKShapeFiles/Crosssection.shp.xml (revision 4511) @@ -0,0 +1,3 @@ + + +{6C66C234-49ED-4C33-AD97-6672285AC6BA}2012012510120700TRUEAddField Crosssection LENGTH DOUBLE # # # # NON_NULLABLE NON_REQUIRED # CrosssectionDeleteField Crosssection OBJECTID;Id;ET_FromAtt;ET_ToAtt;RFLNAAM;DAM_FILTER;RFL;BATCH;Shape_Leng;Shape_Le_1 Crosssection Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/IntersectionOnShapesTest.cs =================================================================== diff -u -r4255 -r4511 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/IntersectionOnShapesTest.cs (.../IntersectionOnShapesTest.cs) (revision 4255) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/IntersectionOnShapesTest.cs (.../IntersectionOnShapesTest.cs) (revision 4511) @@ -22,6 +22,7 @@ using System; using System.Collections.Generic; using System.Diagnostics; +using System.IO; using System.Linq; using DotSpatial.Data; using GeoAPI.Geometries; @@ -38,8 +39,8 @@ [Category("Slow")] public void AllIntersectionsWithTrafficLoad() { - const string crossSectionFile = @"..\..\..\..\..\data\Dam\Waterboards\HHNK\ShapeFiles\Crosssection.shp"; - const string trafficFile = @"..\..\..\..\..\data\Dam\Waterboards\HHNK\ShapeFiles\TrafficLoad.shp"; + string crossSectionFile = Path.Combine(Directory.GetCurrentDirectory(), @"TestData\HHNKShapeFiles\Crosssection.shp"); + string trafficFile = Path.Combine(Directory.GetCurrentDirectory(), @"TestData\HHNKShapeFiles\TrafficLoad.shp"); FindAllIntersectionsDotSpatial(crossSectionFile, trafficFile, 5543, 8329, 5602); } @@ -49,26 +50,26 @@ [Ignore("Takes 25 minutes on buildserver")] public void AllIntersectionsWithPolderLevel() { - const string crossSectionFile = @"..\..\..\..\..\data\Dam\Waterboards\HHNK\ShapeFiles\Crosssection.shp"; - const string polderLevelFile = @"..\..\..\..\..\data\Dam\Waterboards\HHNK\ShapeFiles\PolderLevel.shp"; + string crossSectionFile = Path.Combine(Directory.GetCurrentDirectory(), @"TestData\HHNKShapeFiles\Crosssection.shp"); + string polderLevelFile = Path.Combine(Directory.GetCurrentDirectory(), @"TestData\HHNKShapeFiles\PolderLevel.shp"); FindAllIntersectionsDotSpatial(crossSectionFile, polderLevelFile, 5543, 4393, 12469); } [Test] public void OneIntersectionWithTrafficLoad() { - const string crossSectionFile = @"..\..\..\..\..\data\Dam\Waterboards\HHNK\ShapeFiles\Crosssection.shp"; - const string trafficFile = @"..\..\..\..\..\data\Dam\Waterboards\HHNK\ShapeFiles\TrafficLoad.shp"; + string crossSectionFile = Path.Combine(Directory.GetCurrentDirectory(), @"TestData\HHNKShapeFiles\Crosssection.shp"); + string trafficFile = Path.Combine(Directory.GetCurrentDirectory(), @"TestData\HHNKShapeFiles\TrafficLoad.shp"); FindFirstIntersectionDotSpatial(crossSectionFile, trafficFile, 5543, 8329, 1); } [Test] public void OneIntersectionWithPolderLevel() { - const string crossSectionFile = @"..\..\..\..\..\data\Dam\Waterboards\HHNK\shapefiles\Crosssection.shp"; - const string polderLevelFile = @"..\..\..\..\..\data\Dam\Waterboards\HHNK\ShapeFiles\PolderLevel.shp"; + string crossSectionFile = Path.Combine(Directory.GetCurrentDirectory(), @"TestData\HHNKShapeFiles\Crosssection.shp"); + string polderLevelFile = Path.Combine(Directory.GetCurrentDirectory(), @"TestData\HHNKShapeFiles\PolderLevel.shp"); Debug.WriteLine("--- DotSpatial ---"); FindFirstIntersectionDotSpatial(crossSectionFile, polderLevelFile, 5543, 4393, 2);