Index: Application/Ringtoets/src/Application.Ringtoets.Setup/Licentie.rtf =================================================================== diff -u -r3ba0c50f3a3548264d60e9f347079d0586c53f28 -ra3c8c0cb4384de51a18d77cc7bea487f97ba21e1 --- Application/Ringtoets/src/Application.Ringtoets.Setup/Licentie.rtf (.../Licentie.rtf) (revision 3ba0c50f3a3548264d60e9f347079d0586c53f28) +++ Application/Ringtoets/src/Application.Ringtoets.Setup/Licentie.rtf (.../Licentie.rtf) (revision a3c8c0cb4384de51a18d77cc7bea487f97ba21e1) @@ -1,32 +1,32 @@ {\rtf1\adeflang1025\ansi\ansicpg1252\uc1\adeff0\deff0\stshfdbch31505\stshfloch31506\stshfhich31506\stshfbi0\deflang2057\deflangfe2052\themelang2057\themelangfe2052\themelangcs0{\fonttbl{\f0\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f2\fbidi \fmodern\fcharset0\fprq1{\*\panose 02070309020205020404}Courier New;} -{\f13\fbidi \fnil\fcharset134\fprq2{\*\panose 02010600030101010101}SimSun{\*\falt ????????????????????\'a8\'ac??????????};}{\f34\fbidi \froman\fcharset0\fprq2{\*\panose 02040503050406030204}Cambria Math;} -{\f37\fbidi \fswiss\fcharset0\fprq2{\*\panose 020f0502020204030204}Calibri;}{\f38\fbidi \fswiss\fcharset0\fprq2{\*\panose 020b0604030504040204}Tahoma;}{\f39\fbidi \fnil\fcharset134\fprq2{\*\panose 02010600030101010101}@SimSun;} -{\flomajor\f31500\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\fdbmajor\f31501\fbidi \fnil\fcharset134\fprq2{\*\panose 02010600030101010101}SimSun{\*\falt ????????????????????\'a8\'ac??????????};} +{\f13\fbidi \fnil\fcharset134\fprq2{\*\panose 02010600030101010101}SimSun{\*\falt ????????????????????\'a1\'a7??????????};}{\f34\fbidi \froman\fcharset0\fprq2{\*\panose 02040503050406030204}Cambria Math;} +{\f37\fbidi \fswiss\fcharset0\fprq2{\*\panose 020f0502020204030204}Calibri;}{\f38\fbidi \fswiss\fcharset0\fprq2{\*\panose 020b0604030504040204}Tahoma;}{\f43\fbidi \fnil\fcharset134\fprq2{\*\panose 00000000000000000000}@SimSun;} +{\flomajor\f31500\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\fdbmajor\f31501\fbidi \fnil\fcharset134\fprq2{\*\panose 02010600030101010101}SimSun{\*\falt ????????????????????\'a1\'a7??????????};} {\fhimajor\f31502\fbidi \froman\fcharset0\fprq2{\*\panose 02040503050406030204}Cambria;}{\fbimajor\f31503\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;} -{\flominor\f31504\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\fdbminor\f31505\fbidi \fnil\fcharset134\fprq2{\*\panose 02010600030101010101}SimSun{\*\falt ????????????????????\'a8\'ac??????????};} -{\fhiminor\f31506\fbidi \fswiss\fcharset0\fprq2{\*\panose 020f0502020204030204}Calibri;}{\fbiminor\f31507\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f40\fbidi \froman\fcharset238\fprq2 Times New Roman CE;} -{\f41\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\f43\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\f44\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\f45\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);} -{\f46\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\f47\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\f48\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\f60\fbidi \fmodern\fcharset238\fprq1 Courier New CE;} -{\f61\fbidi \fmodern\fcharset204\fprq1 Courier New Cyr;}{\f63\fbidi \fmodern\fcharset161\fprq1 Courier New Greek;}{\f64\fbidi \fmodern\fcharset162\fprq1 Courier New Tur;}{\f65\fbidi \fmodern\fcharset177\fprq1 Courier New (Hebrew);} -{\f66\fbidi \fmodern\fcharset178\fprq1 Courier New (Arabic);}{\f67\fbidi \fmodern\fcharset186\fprq1 Courier New Baltic;}{\f68\fbidi \fmodern\fcharset163\fprq1 Courier New (Vietnamese);} -{\f172\fbidi \fnil\fcharset0\fprq2 SimSun Western{\*\falt ????????????????????\'a8\'ac??????????};}{\f380\fbidi \froman\fcharset238\fprq2 Cambria Math CE;}{\f381\fbidi \froman\fcharset204\fprq2 Cambria Math Cyr;} -{\f383\fbidi \froman\fcharset161\fprq2 Cambria Math Greek;}{\f384\fbidi \froman\fcharset162\fprq2 Cambria Math Tur;}{\f387\fbidi \froman\fcharset186\fprq2 Cambria Math Baltic;}{\f388\fbidi \froman\fcharset163\fprq2 Cambria Math (Vietnamese);} -{\f410\fbidi \fswiss\fcharset238\fprq2 Calibri CE;}{\f411\fbidi \fswiss\fcharset204\fprq2 Calibri Cyr;}{\f413\fbidi \fswiss\fcharset161\fprq2 Calibri Greek;}{\f414\fbidi \fswiss\fcharset162\fprq2 Calibri Tur;} -{\f417\fbidi \fswiss\fcharset186\fprq2 Calibri Baltic;}{\f418\fbidi \fswiss\fcharset163\fprq2 Calibri (Vietnamese);}{\f420\fbidi \fswiss\fcharset238\fprq2 Tahoma CE;}{\f421\fbidi \fswiss\fcharset204\fprq2 Tahoma Cyr;} -{\f423\fbidi \fswiss\fcharset161\fprq2 Tahoma Greek;}{\f424\fbidi \fswiss\fcharset162\fprq2 Tahoma Tur;}{\f425\fbidi \fswiss\fcharset177\fprq2 Tahoma (Hebrew);}{\f426\fbidi \fswiss\fcharset178\fprq2 Tahoma (Arabic);} -{\f427\fbidi \fswiss\fcharset186\fprq2 Tahoma Baltic;}{\f428\fbidi \fswiss\fcharset163\fprq2 Tahoma (Vietnamese);}{\f429\fbidi \fswiss\fcharset222\fprq2 Tahoma (Thai);}{\f432\fbidi \fnil\fcharset0\fprq2 @SimSun Western;} +{\flominor\f31504\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\fdbminor\f31505\fbidi \fnil\fcharset134\fprq2{\*\panose 02010600030101010101}SimSun{\*\falt ????????????????????\'a1\'a7??????????};} +{\fhiminor\f31506\fbidi \fswiss\fcharset0\fprq2{\*\panose 020f0502020204030204}Calibri;}{\fbiminor\f31507\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f44\fbidi \froman\fcharset238\fprq2 Times New Roman CE;} +{\f45\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\f47\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\f48\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\f49\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);} +{\f50\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\f51\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\f52\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\f64\fbidi \fmodern\fcharset238\fprq1 Courier New CE;} +{\f65\fbidi \fmodern\fcharset204\fprq1 Courier New Cyr;}{\f67\fbidi \fmodern\fcharset161\fprq1 Courier New Greek;}{\f68\fbidi \fmodern\fcharset162\fprq1 Courier New Tur;}{\f69\fbidi \fmodern\fcharset177\fprq1 Courier New (Hebrew);} +{\f70\fbidi \fmodern\fcharset178\fprq1 Courier New (Arabic);}{\f71\fbidi \fmodern\fcharset186\fprq1 Courier New Baltic;}{\f72\fbidi \fmodern\fcharset163\fprq1 Courier New (Vietnamese);} +{\f176\fbidi \fnil\fcharset0\fprq2 SimSun Western{\*\falt ????????????????????\'a1\'a7??????????};}{\f384\fbidi \froman\fcharset238\fprq2 Cambria Math CE;}{\f385\fbidi \froman\fcharset204\fprq2 Cambria Math Cyr;} +{\f387\fbidi \froman\fcharset161\fprq2 Cambria Math Greek;}{\f388\fbidi \froman\fcharset162\fprq2 Cambria Math Tur;}{\f391\fbidi \froman\fcharset186\fprq2 Cambria Math Baltic;}{\f392\fbidi \froman\fcharset163\fprq2 Cambria Math (Vietnamese);} +{\f414\fbidi \fswiss\fcharset238\fprq2 Calibri CE;}{\f415\fbidi \fswiss\fcharset204\fprq2 Calibri Cyr;}{\f417\fbidi \fswiss\fcharset161\fprq2 Calibri Greek;}{\f418\fbidi \fswiss\fcharset162\fprq2 Calibri Tur;} +{\f421\fbidi \fswiss\fcharset186\fprq2 Calibri Baltic;}{\f422\fbidi \fswiss\fcharset163\fprq2 Calibri (Vietnamese);}{\f424\fbidi \fswiss\fcharset238\fprq2 Tahoma CE;}{\f425\fbidi \fswiss\fcharset204\fprq2 Tahoma Cyr;} +{\f427\fbidi \fswiss\fcharset161\fprq2 Tahoma Greek;}{\f428\fbidi \fswiss\fcharset162\fprq2 Tahoma Tur;}{\f429\fbidi \fswiss\fcharset177\fprq2 Tahoma (Hebrew);}{\f430\fbidi \fswiss\fcharset178\fprq2 Tahoma (Arabic);} +{\f431\fbidi \fswiss\fcharset186\fprq2 Tahoma Baltic;}{\f432\fbidi \fswiss\fcharset163\fprq2 Tahoma (Vietnamese);}{\f433\fbidi \fswiss\fcharset222\fprq2 Tahoma (Thai);}{\f476\fbidi \fnil\fcharset0\fprq2 @SimSun Western;} {\flomajor\f31508\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\flomajor\f31509\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\flomajor\f31511\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;} {\flomajor\f31512\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\flomajor\f31513\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\flomajor\f31514\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);} {\flomajor\f31515\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\flomajor\f31516\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);} -{\fdbmajor\f31520\fbidi \fnil\fcharset0\fprq2 SimSun Western{\*\falt ????????????????????\'a8\'ac??????????};}{\fhimajor\f31528\fbidi \froman\fcharset238\fprq2 Cambria CE;}{\fhimajor\f31529\fbidi \froman\fcharset204\fprq2 Cambria Cyr;} +{\fdbmajor\f31520\fbidi \fnil\fcharset0\fprq2 SimSun Western{\*\falt ????????????????????\'a1\'a7??????????};}{\fhimajor\f31528\fbidi \froman\fcharset238\fprq2 Cambria CE;}{\fhimajor\f31529\fbidi \froman\fcharset204\fprq2 Cambria Cyr;} {\fhimajor\f31531\fbidi \froman\fcharset161\fprq2 Cambria Greek;}{\fhimajor\f31532\fbidi \froman\fcharset162\fprq2 Cambria Tur;}{\fhimajor\f31535\fbidi \froman\fcharset186\fprq2 Cambria Baltic;} {\fhimajor\f31536\fbidi \froman\fcharset163\fprq2 Cambria (Vietnamese);}{\fbimajor\f31538\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\fbimajor\f31539\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;} {\fbimajor\f31541\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\fbimajor\f31542\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\fbimajor\f31543\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);} {\fbimajor\f31544\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\fbimajor\f31545\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\fbimajor\f31546\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);} {\flominor\f31548\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\flominor\f31549\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\flominor\f31551\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;} {\flominor\f31552\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\flominor\f31553\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\flominor\f31554\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);} {\flominor\f31555\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\flominor\f31556\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);} -{\fdbminor\f31560\fbidi \fnil\fcharset0\fprq2 SimSun Western{\*\falt ????????????????????\'a8\'ac??????????};}{\fhiminor\f31568\fbidi \fswiss\fcharset238\fprq2 Calibri CE;}{\fhiminor\f31569\fbidi \fswiss\fcharset204\fprq2 Calibri Cyr;} +{\fdbminor\f31560\fbidi \fnil\fcharset0\fprq2 SimSun Western{\*\falt ????????????????????\'a1\'a7??????????};}{\fhiminor\f31568\fbidi \fswiss\fcharset238\fprq2 Calibri CE;}{\fhiminor\f31569\fbidi \fswiss\fcharset204\fprq2 Calibri Cyr;} {\fhiminor\f31571\fbidi \fswiss\fcharset161\fprq2 Calibri Greek;}{\fhiminor\f31572\fbidi \fswiss\fcharset162\fprq2 Calibri Tur;}{\fhiminor\f31575\fbidi \fswiss\fcharset186\fprq2 Calibri Baltic;} {\fhiminor\f31576\fbidi \fswiss\fcharset163\fprq2 Calibri (Vietnamese);}{\fbiminor\f31578\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\fbiminor\f31579\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;} {\fbiminor\f31581\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\fbiminor\f31582\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\fbiminor\f31583\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);} @@ -35,22 +35,22 @@ \red128\green0\blue128;\red128\green0\blue0;\red128\green128\blue0;\red128\green128\blue128;\red192\green192\blue192;\chyperlink\ctint255\cshade255\red0\green0\blue255;\red51\green51\blue51;}{\*\defchp \fs22\loch\af31506\hich\af31506\dbch\af31505 } {\*\defpap \ql \li0\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 }\noqfpromote {\stylesheet{\ql \li0\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af0\afs22\alang1025 \ltrch\fcs0 \fs22\lang2057\langfe2052\loch\f31506\hich\af31506\dbch\af31505\cgrid\langnp2057\langfenp2052 \snext0 \sqformat \spriority0 Normal;}{\*\cs10 \additive \ssemihidden \sunhideused \spriority1 -Default Paragraph Font;}{\*\ts11\tsrowd\trftsWidthB3\trpaddl108\trpaddr108\trpaddfl3\trpaddft3\trpaddfb3\trpaddfr3\trcbpat1\trcfpat1\tblind0\tblindtype3\tsvertalt\tsbrdrt\tsbrdrl\tsbrdrb\tsbrdrr\tsbrdrdgl\tsbrdrdgr\tsbrdrh\tsbrdrv -\ql \li0\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af0\afs22\alang1025 \ltrch\fcs0 \fs22\lang2057\langfe2052\loch\f31506\hich\af31506\dbch\af31505\cgrid\langnp2057\langfenp2052 -\snext11 \ssemihidden \sunhideused Normal Table;}{\*\cs15 \additive \rtlch\fcs1 \af0 \ltrch\fcs0 \ul\cf17 \sbasedon10 \sunhideused \styrsid7675473 Hyperlink;}{\*\cs16 \additive \rtlch\fcs1 \af0\afs16 \ltrch\fcs0 \fs16 -\sbasedon10 \ssemihidden \sunhideused \styrsid7675473 annotation reference;}{\s17\ql \li0\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af0\afs20\alang1025 \ltrch\fcs0 +Default Paragraph Font;}{\*\ts11\tsrowd\trftsWidthB3\trpaddl108\trpaddr108\trpaddfl3\trpaddft3\trpaddfb3\trpaddfr3\tblind0\tblindtype3\tsvertalt\tsbrdrt\tsbrdrl\tsbrdrb\tsbrdrr\tsbrdrdgl\tsbrdrdgr\tsbrdrh\tsbrdrv \ql \li0\ri0\sa200\sl276\slmult1 +\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af0\afs22\alang1025 \ltrch\fcs0 \fs22\lang2057\langfe2052\loch\f31506\hich\af31506\dbch\af31505\cgrid\langnp2057\langfenp2052 \snext11 \ssemihidden \sunhideused +Normal Table;}{\*\cs15 \additive \rtlch\fcs1 \af0 \ltrch\fcs0 \ul\cf17 \sbasedon10 \sunhideused \styrsid7675473 Hyperlink;}{\*\cs16 \additive \rtlch\fcs1 \af0\afs16 \ltrch\fcs0 \fs16 \sbasedon10 \ssemihidden \sunhideused \styrsid7675473 +annotation reference;}{\s17\ql \li0\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af0\afs20\alang1025 \ltrch\fcs0 \fs20\lang2057\langfe2052\loch\f31506\hich\af31506\dbch\af31505\cgrid\langnp2057\langfenp2052 \sbasedon0 \snext17 \slink18 \ssemihidden \sunhideused \styrsid7675473 annotation text;}{\*\cs18 \additive \rtlch\fcs1 \af0\afs20 \ltrch\fcs0 \fs20 \sbasedon10 \slink17 \slocked \ssemihidden \styrsid7675473 Comment Text Char;}{\s19\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af38\afs16\alang1025 \ltrch\fcs0 \fs16\lang2057\langfe2052\loch\f38\hich\af38\dbch\af31505\cgrid\langnp2057\langfenp2052 \sbasedon0 \snext19 \slink20 \ssemihidden \sunhideused \styrsid7675473 Balloon Text;}{\*\cs20 \additive \rtlch\fcs1 \af38\afs16 \ltrch\fcs0 \f38\fs16 \sbasedon10 \slink19 \slocked \ssemihidden \styrsid7675473 Balloon Text Char;}{\s21\ql \li720\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin720\itap0\contextualspace \rtlch\fcs1 \af0\afs22\alang1025 \ltrch\fcs0 \fs22\lang2057\langfe2052\loch\f31506\hich\af31506\dbch\af31505\cgrid\langnp2057\langfenp2052 \sbasedon0 \snext21 \sqformat \spriority34 \styrsid1010843 List Paragraph;}}{\*\rsidtbl \rsid23861\rsid488029\rsid799973\rsid984897\rsid1010843\rsid1055020 \rsid1180769\rsid1201894\rsid1206572\rsid1391986\rsid1800570\rsid1862769\rsid1918796\rsid2112962\rsid2185294\rsid2448324\rsid2703580\rsid3020322\rsid3093214\rsid3426710\rsid3474088\rsid3612330\rsid3686156\rsid4150084\rsid4392039\rsid4733976\rsid4742281 -\rsid5267739\rsid5593428\rsid5862844\rsid5910193\rsid6624093\rsid6822061\rsid6904447\rsid6947589\rsid7414554\rsid7672292\rsid7675473\rsid7691196\rsid7881760\rsid8282417\rsid8336808\rsid8415516\rsid8471656\rsid8613675\rsid9251590\rsid9259169\rsid9259511 -\rsid9324301\rsid9447286\rsid9534683\rsid9597286\rsid9837452\rsid10243997\rsid10645519\rsid10889275\rsid10903480\rsid10907227\rsid10965045\rsid10969153\rsid11404854\rsid11541481\rsid11865015\rsid11875882\rsid12255994\rsid12603449\rsid12614763\rsid12714335 -\rsid12780684\rsid12874015\rsid12992049\rsid13187850\rsid13327662\rsid13378822\rsid13707436\rsid13846203\rsid13923732\rsid14042855\rsid14624369\rsid14690030\rsid14697806\rsid14769386\rsid15292511\rsid15341850\rsid15549573\rsid15600639\rsid15998385 -\rsid16073068\rsid16086011\rsid16653078}{\mmathPr\mmathFont34\mbrkBin0\mbrkBinSub0\msmallFrac0\mdispDef1\mlMargin0\mrMargin0\mdefJc1\mwrapIndent1440\mintLim0\mnaryLim1}{\info{\title License Agreement}{\author Deltares}{\operator Marten Janssen} -{\creatim\yr2016\mo1\dy13\hr16\min25}{\revtim\yr2016\mo2\dy18\hr15\min9}{\printim\yr2016\mo1\dy13\hr13\min29}{\version26}{\edmins29}{\nofpages3}{\nofwords861}{\nofchars4912}{\*\company Stichting Deltares}{\nofcharsws5762}{\vern49167}} -{\*\xmlnstbl {\xmlns1 http://schemas.microsoft.com/office/word/2003/wordml}}\paperw12240\paperh15840\margl1440\margr1440\margt1440\margb1440\gutter0\ltrsect +\rsid5267739\rsid5593428\rsid5862844\rsid5910193\rsid6624093\rsid6822061\rsid6904447\rsid6947589\rsid7414554\rsid7672292\rsid7675473\rsid7691196\rsid7881760\rsid8282417\rsid8336808\rsid8355315\rsid8415516\rsid8471656\rsid8613675\rsid9251590\rsid9259169 +\rsid9259511\rsid9324301\rsid9447286\rsid9534683\rsid9597286\rsid9837452\rsid10243997\rsid10645519\rsid10889275\rsid10903480\rsid10907227\rsid10965045\rsid10969153\rsid11404854\rsid11541481\rsid11865015\rsid11875882\rsid12255994\rsid12603449\rsid12614763 +\rsid12714335\rsid12780684\rsid12874015\rsid12992049\rsid13187850\rsid13327662\rsid13378822\rsid13707436\rsid13846203\rsid13923732\rsid14042855\rsid14624369\rsid14690030\rsid14697806\rsid14769386\rsid15292511\rsid15341850\rsid15549573\rsid15600639 +\rsid15998385\rsid16073068\rsid16086011\rsid16653078}{\mmathPr\mmathFont34\mbrkBin0\mbrkBinSub0\msmallFrac0\mdispDef1\mlMargin0\mrMargin0\mdefJc1\mwrapIndent1440\mintLim0\mnaryLim1}{\info{\title License Agreement}{\author Deltares} +{\operator Bas des Bouvrie}{\creatim\yr2016\mo1\dy13\hr16\min25}{\revtim\yr2016\mo2\dy19\hr15}{\printim\yr2016\mo1\dy13\hr13\min29}{\version27}{\edmins29}{\nofpages3}{\nofwords861}{\nofchars4912}{\*\company Stichting Deltares}{\nofcharsws5762} +{\vern49167}}{\*\xmlnstbl {\xmlns1 http://schemas.microsoft.com/office/word/2003/wordml}}\paperw12240\paperh15840\margl1440\margr1440\margt1440\margb1440\gutter0\ltrsect \widowctrl\ftnbj\aenddoc\hyphhotz425\trackmoves0\trackformatting1\donotembedsysfont1\relyonvml0\donotembedlingdata0\grfdocevents0\validatexml1\showplaceholdtext0\ignoremixedcontent0\saveinvalidxml0\showxmlerrors1 \noxlattoyen\expshrtn\noultrlspc\dntblnsbdb\nospaceforul\formshade\horzdoc\dgmargin\dghspace180\dgvspace180\dghorigin1440\dgvorigin1440\dghshow1\dgvshow1 \jexpand\viewkind1\viewscale110\pgbrdrhead\pgbrdrfoot\splytwnine\ftnlytwnine\htmautsp\nolnhtadjtbl\useltbaln\alntblind\lytcalctblwd\lyttblrtgr\lnbrkrule\nobrkwrptbl\snaptogridincell\allowfieldendsel\wrppunct @@ -156,7 +156,8 @@ \par }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid9324301\charrsid9597286 \hich\af2\dbch\af31505\loch\f2 6}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid11865015\charrsid9597286 \hich\af2\dbch\af31505\loch\f2 . Core.Common.Version.dll}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid11865015 \par }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid7414554 \hich\af2\dbch\af31505\loch\f2 7. Core.Components.Gis.dll -\par }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid4742281 \hich\af2\dbch\af31505\loch\f2 8. Core.Components.Gui.IO.dll}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 +\par }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid4742281 \hich\af2\dbch\af31505\loch\f2 8. Core.Components.G}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid8355315 +\hich\af2\dbch\af31505\loch\f2 is}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid4742281 \hich\af2\dbch\af31505\loch\f2 .IO.dll}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid4742281\charrsid9597286 \par }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid4742281 \hich\af2\dbch\af31505\loch\f2 9}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid11865015\charrsid9597286 \hich\af2\dbch\af31505\loch\f2 . Core.Components.DotSpatial.dll}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid11865015 @@ -205,11 +206,9 @@ \par }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid1055020 \hich\af2\dbch\af31505\loch\f2 8}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid12714335 \hich\af2\dbch\af31505\loch\f2 . Ringtoets.HydraRing.Data.dll \par }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid1055020 \hich\af2\dbch\af31505\loch\f2 9}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid6947589 \hich\af2\dbch\af31505\loch\f2 . Ringtoets.HydraRing.Forms}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid4392039 \hich\af2\dbch\af31505\loch\f2 .dll -\par }\pard \ltrpar\ql \fi-360\li1215\ri0\nowidctlpar\wrapdefault\faauto\rin0\lin1215\itap0\pararsid8282417 {\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid8282417 \hich\af2\dbch\af31505\loch\f2 10}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 -\f2\fs21\insrsid8282417 \hich\af2\dbch\af31505\loch\f2 . Ringtoets.HydraRing.}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid8282417 \hich\af2\dbch\af31505\loch\f2 IO}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid8282417 -\hich\af2\dbch\af31505\loch\f2 .dll}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid8282417 -\par \hich\af2\dbch\af31505\loch\f2 11}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid8282417 \hich\af2\dbch\af31505\loch\f2 . Ringtoets.HydraRing.}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid8282417 \hich\af2\dbch\af31505\loch\f2 Plugin}{ -\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid8282417 \hich\af2\dbch\af31505\loch\f2 .dll}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid8282417\charrsid13327662 +\par }\pard \ltrpar\ql \fi-360\li1215\ri0\nowidctlpar\wrapdefault\faauto\rin0\lin1215\itap0\pararsid8282417 {\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid8282417 \hich\af2\dbch\af31505\loch\f2 10\hich\af2\dbch\af31505\loch\f2 . Ringtoets.HydraRing.IO.dll + +\par \hich\af2\dbch\af31505\loch\f2 11. Ringtoets.HydraRing.Plugin.dll}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid8282417\charrsid13327662 \par }\pard \ltrpar\ql \fi-360\li1215\ri0\nowidctlpar\wrapdefault\faauto\rin0\lin1215\itap0\pararsid15600639 {\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid1055020 \hich\af2\dbch\af31505\loch\f2 1}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid8282417 \hich\af2\dbch\af31505\loch\f2 2}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid15600639\charrsid13327662 \hich\af2\dbch\af31505\loch\f2 . Ringtoets.Integration.Data.dll \par }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid8282417 \hich\af2\dbch\af31505\loch\f2 13}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid15600639\charrsid13327662 \hich\af2\dbch\af31505\loch\f2 . Ringtoets.Integration}{\rtlch\fcs1 \af2\afs21 @@ -222,16 +221,14 @@ \par }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid8282417 \hich\af2\dbch\af31505\loch\f2 19}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid15600639\charrsid15600639 \hich\af2\dbch\af31505\loch\f2 . Ringtoets.Piping.Plugin.dll \par }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid8282417 \hich\af2\dbch\af31505\loch\f2 20}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid15600639\charrsid15600639 \hich\af2\dbch\af31505\loch\f2 . Ringtoets.Piping.Service.dll \par }\pard \ltrpar\ql \li0\ri0\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0\pararsid15600639 {\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\insrsid15600639\charrsid15600639 -\par }{\rtlch\fcs1 \ab\af2\afs24 \ltrch\fcs0 \b\f2\fs24\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid8282417 \hich\af2\dbch\af31505\loch\f2 A. \tab }{\rtlch\fcs1 \ab\af2\afs24 \ltrch\fcs0 -\b\f2\fs24\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid1800570 \hich\af2\dbch\af31505\loch\f2 \hich\f2 Software licentievoorwaarden onder de \'93\loch\f2 \hich\f2 GNU LESSER GENERAL PUBLIC LICENSE\'94\loch\f2 - versie 3 zoals gepubliceerd door de Free Software Foundation. +\par }{\rtlch\fcs1 \ab\af2\afs24 \ltrch\fcs0 \b\f2\fs24\insrsid15600639\charrsid8355315 \hich\af2\dbch\af31505\loch\f2 A. \tab }{\rtlch\fcs1 \ab\af2\afs24 \ltrch\fcs0 \b\f2\fs24\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid1800570 +\hich\af2\dbch\af31505\loch\f2 \hich\f2 Software licentievoorwaarden onder de \'93\loch\f2 \hich\f2 GNU LESSER GENERAL PUBLIC LICENSE\'94\loch\f2 versie 3 zoals gepubliceerd door de Free Software Found\hich\af2\dbch\af31505\loch\f2 ation. \par }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid1800570 \par }\pard \ltrpar\ql \li0\ri0\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0\pararsid9259511 {\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid5593428 \hich\af2\dbch\af31505\loch\f2 1. }{\rtlch\fcs1 -\af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid9259511\charrsid1010843 \hich\af2\dbch\af31505\loch\f2 Dit programma genaamd \hich\f2 \lquote \loch\f2 Ringtoets\hich\f2 \rquote \hich\af2\dbch\af31505\loch\f2 +\af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid9259511\charrsid1010843 \hich\af2\dbch\af31505\loch\f2 Dit programma genaamd \hich\f2 \lquote \loch\f2 Ringtoets\hich\f2 \rquote \loch\f2 is software voor het gebruik bij het toetsen van dijken overeenkomstig het }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid9259511 \hich\af2\dbch\af31505\loch\f2 WTI 2017 }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 -\f2\fs21\lang1043\langfe2052\langnp1043\insrsid9259511\charrsid1010843 \hich\af2\dbch\af31505\loch\f2 -voor dijken. Ringtoets is nog in ontwikkeling en nog niet voldoende getest om te gebruiken anders dan voor kennisname van haar functionaliteiten. Ieder ander gebruik wordt\hich\af2\dbch\af31505\loch\f2 ten stelligste afgeraden door Deltares. }{ -\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid9259511 +\f2\fs21\lang1043\langfe2052\langnp1043\insrsid9259511\charrsid1010843 \hich\af2\dbch\af31505\loch\f2 voor dijken. Ringtoets is nog in ontwikkeling en nog niet voldoende getest om te gebruiken anders dan voor kennisname van haar +\hich\af2\dbch\af31505\loch\f2 functionaliteiten. Ieder ander gebruik wordt ten stelligste afgeraden door Deltares. }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid9259511 \par }\pard \ltrpar\ql \li0\ri0\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0\pararsid15600639 {\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15549573 \par \hich\af2\dbch\af31505\loch\f2 2. }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid5593428 \hich\af2\dbch\af31505\loch\f2 Copyright }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15341850 \loch\af2\dbch\af31505\hich\f2 \'a9\loch\f2 }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid5593428 \hich\af2\dbch\af31505\loch\f2 @@ -252,15 +249,15 @@ voor meer details. \par \par }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15549573 \hich\af2\dbch\af31505\loch\f2 5}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid14624369 -\hich\af2\dbch\af31505\loch\f2 . De tekst van de GNU Lesser General Public License }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639 \hich\af2\dbch\af31505\loch\f2 versie 3 }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 -\f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid14624369 \hich\af2\dbch\af31505\loch\f2 wordt gezamenlijk m\hich\af2\dbch\af31505\loch\f2 et de Software}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 +\hich\af2\dbch\af31505\loch\f2 . De tekst van de GNU Lesser G\hich\af2\dbch\af31505\loch\f2 eneral Public License }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639 \hich\af2\dbch\af31505\loch\f2 versie 3 }{ +\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid14624369 \hich\af2\dbch\af31505\loch\f2 wordt gezamenlijk met de Software}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639 \hich\af2\dbch\af31505\loch\f2 geleverd}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid14624369 \hich\af2\dbch\af31505\loch\f2 . }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid5593428 \hich\af2\dbch\af31505\loch\f2 Zo niet, zie dan }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid4150084 \hich\af2\dbch\af31505\loch\f2 <}{\field\fldedit{\*\fldinst {\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639 \hich\af2\dbch\af31505\loch\f2 HYPERLINK "}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid1800570 \hich\af2\dbch\af31505\loch\f2 http://www.gnu.org/licenses/lgpl-3.0.en.html}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639 \hich\af2\dbch\af31505\loch\f2 " }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639 {\*\datafield 00d0c9ea79f9bace118c8200aa004ba90b0200000003000000e0c9ea79f9bace118c8200aa004ba90b7200000068007400740070003a002f002f007700770077002e0067006e0075002e006f00720067002f006c006900630065006e007300650073002f006c00670070006c002d0033002e0030002e0065006e002e006800 -74006d006c000000795881f43b1d7f48af2c825dc485276300000000a5ab0000000000004400e900006e14ec68d800000000000700b2004f000000}}}{\fldrslt {\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \cs15\f2\fs21\ul\cf17\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid9534683 +74006d006c000000795881f43b1d7f48af2c825dc485276300000000a5ab0000000000004400e900006e14ec68d800000000000700b2004f000000ec}}}{\fldrslt {\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \cs15\f2\fs21\ul\cf17\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid9534683 \hich\af2\dbch\af31505\loch\f2 http://www.gnu.org/licenses/lgpl-3.0.en.html}}}\sectd \ltrsect\linex0\headery708\footery708\colsx708\sectdefaultcl\sftnbj {\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid4150084 \hich\af2\dbch\af31505\loch\f2 >}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid12603449 \hich\af2\dbch\af31505\loch\f2 }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639 \hich\af2\dbch\af31505\loch\f2 voor de tekst}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid5593428 . @@ -271,19 +268,19 @@ \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639 \hich\af2\dbch\af31505\loch\f2 geregistreerde merknamen van}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid14624369 \hich\af2\dbch\af31505\loch\f2 Stichting Deltares, }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639 \hich\af2\dbch\af31505\loch\f2 en blijven te allen tijde eigendom van}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid14624369 \hich\af2\dbch\af31505\loch\f2 Stichting Deltares. }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid13187850 -\hich\af2\dbch\af31505\loch\f2 Alle rechten voorbehoude\hich\af2\dbch\af31505\loch\f2 n. +\hich\af2\dbch\af31505\loch\f2 Alle rechten voorbehouden. \par \par }\pard \ltrpar\ql \li855\ri0\nowidctlpar\wrapdefault\faauto\rin0\lin855\itap0\pararsid15600639 {\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid13187850 \par }\pard \ltrpar\ql \li0\ri0\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0\pararsid15600639 {\rtlch\fcs1 \ab\af2\afs24 \ltrch\fcs0 \b\f2\fs24\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid5593428 \hich\af2\dbch\af31505\loch\f2 B.\tab }{ \rtlch\fcs1 \ab\af2\afs24 \ltrch\fcs0 \b\f2\fs24\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid1800570 \hich\af2\dbch\af31505\loch\f2 \hich\f2 Software licentievoorwaarden onder de \'93\loch\f2 \hich\f2 GNU GENERAL PUBLIC LICENSE\'94\loch\f2 versie 3 zoals gepubliceerd door de Free Software Foundation.}{\rtlch\fcs1 \ab\af2\afs24 \ltrch\fcs0 \b\f2\fs24\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid5593428 \par }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid1800570 \par }\pard \ltrpar\ql \li0\ri0\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0\pararsid16073068 {\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid5593428 \hich\af2\dbch\af31505\loch\f2 1. }{\rtlch\fcs1 -\af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid16073068\charrsid1010843 \hich\af2\dbch\af31505\loch\f2 Dit programma genaamd \hich\f2 \lquote \loch\f2 Ringtoets\hich\f2 \rquote \loch\f2 +\af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid16073068\charrsid1010843 \hich\af2\dbch\af31505\loch\f2 Dit programma genaamd \hich\f2 \lquote \loch\f2 Ringtoets\hich\f2 \rquote \hich\af2\dbch\af31505\loch\f2 is software voor het gebruik bij het toetsen van dijken overeenkomstig het }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid16073068 \hich\af2\dbch\af31505\loch\f2 WTI 2017 }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid16073068\charrsid1010843 \hich\af2\dbch\af31505\loch\f2 -voor dijken. Ringtoets is nog in ontwikkeling en nog niet voldoende getest om te gebruiken anders dan voor kennisname van haar functionaliteiten. Ieder ander gebruik wordt ten stelligste afgeraden door Deltares. }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 -\f2\fs21\lang1043\langfe2052\langnp1043\insrsid16073068 +voor dijken. Ringtoets is nog in ontwikkeling en nog niet voldoende getest om te gebruiken anders dan voor kennisname van haar functionaliteiten. Ieder ander gebruik wordt\hich\af2\dbch\af31505\loch\f2 ten stelligste afgeraden door Deltares. }{ +\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid16073068 \par }\pard \ltrpar\ql \li0\ri0\nowidctlpar\wrapdefault\faauto\rin0\lin0\itap0\pararsid15600639 {\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15549573 \par \hich\af2\dbch\af31505\loch\f2 2. }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid5593428 \hich\af2\dbch\af31505\loch\f2 Copyright}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid3020322 \hich\af2\dbch\af31505\loch\f2 \hich\f2 \'a9}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid5593428 \hich\af2\dbch\af31505\loch\f2 @@ -313,7 +310,7 @@ \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid3686156 \hich\af2\dbch\af31505\loch\f2 http://www.gnu.org/licenses/gpl-3.0.en.html}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639 \hich\af2\dbch\af31505\loch\f2 " }{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639 {\*\datafield 00d0c9ea79f9bace118c8200aa004ba90b0200000003000000e0c9ea79f9bace118c8200aa004ba90b7000000068007400740070003a002f002f007700770077002e0067006e0075002e006f00720067002f006c006900630065006e007300650073002f00670070006c002d0033002e0030002e0065006e002e0068007400 -6d006c000000795881f43b1d7f48af2c825dc485276300000000a5ab000000477d4c0000945e0000000065002f30000060b300040000000000}}}{\fldrslt {\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \cs15\f2\fs21\ul\cf17\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid9534683 +6d006c000000795881f43b1d7f48af2c825dc485276300000000a5ab000000477d4c0000945e0000000065002f30000060b30004000000000000}}}{\fldrslt {\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \cs15\f2\fs21\ul\cf17\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid9534683 \hich\af2\dbch\af31505\loch\f2 http://www.gnu.org/licenses/gpl-3.0.en.html}}}\sectd \ltrsect\linex0\headery708\footery708\colsx708\sectdefaultcl\sftnbj {\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid4150084 \hich\af2\dbch\af31505\loch\f2 >}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639 \hich\af2\dbch\af31505\loch\f2 voor de tekst}{\rtlch\fcs1 \af2\afs21 \ltrch\fcs0 \f2\fs21\lang1043\langfe2052\langnp1043\insrsid15600639\charrsid5593428 . @@ -431,8 +428,8 @@ ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -ffffffffffffffffffffffffffffffff52006f006f007400200045006e00740072007900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000016000500ffffffffffffffffffffffff0c6ad98892f1d411a65f0040963251e50000000000000000000000002035 -30fb556ad101feffffff00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff00000000000000000000000000000000000000000000000000000000 +ffffffffffffffffffffffffffffffff52006f006f007400200045006e00740072007900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000016000500ffffffffffffffffffffffff0c6ad98892f1d411a65f0040963251e50000000000000000000000009005 +9bf01d6bd101feffffff00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff00000000000000000000000000000000000000000000000000000000 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff0000000000000000000000000000000000000000000000000000 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000105000000000000}} \ No newline at end of file Index: Core/Common/src/Core.Common.Gui/PropertyBag/DynamicPropertyBag.cs =================================================================== diff -u -ref1c61d94f2aec3b4ff32fcf03253d7ad386c8e5 -ra3c8c0cb4384de51a18d77cc7bea487f97ba21e1 --- Core/Common/src/Core.Common.Gui/PropertyBag/DynamicPropertyBag.cs (.../DynamicPropertyBag.cs) (revision ef1c61d94f2aec3b4ff32fcf03253d7ad386c8e5) +++ Core/Common/src/Core.Common.Gui/PropertyBag/DynamicPropertyBag.cs (.../DynamicPropertyBag.cs) (revision a3c8c0cb4384de51a18d77cc7bea487f97ba21e1) @@ -150,7 +150,7 @@ var propertyOrderAttribute = pd.Attributes.OfType().FirstOrDefault(); if (propertyOrderAttribute != null) { - propertiesWithOrdering.Add(new Tuple(propertyOrderAttribute.Order, pd)); + propertiesWithOrdering.Add(Tuple.Create(propertyOrderAttribute.Order, pd)); } else { Index: Core/Common/src/Core.Common.IO/Exceptions/ElementReadException.cs =================================================================== diff -u -rcd709418712e8fa50e2e8a0da0e2488139ac9054 -ra3c8c0cb4384de51a18d77cc7bea487f97ba21e1 --- Core/Common/src/Core.Common.IO/Exceptions/ElementReadException.cs (.../ElementReadException.cs) (revision cd709418712e8fa50e2e8a0da0e2488139ac9054) +++ Core/Common/src/Core.Common.IO/Exceptions/ElementReadException.cs (.../ElementReadException.cs) (revision a3c8c0cb4384de51a18d77cc7bea487f97ba21e1) @@ -25,7 +25,7 @@ { /// /// The exception that is thrown when a file reader class encounters an error while - /// reading an particular element from the file. + /// reading a particular element from the file. /// public class ElementReadException : Exception { Index: Core/Common/test/Core.Common.IO.Test/Exceptions/CriticalFileReadExceptionTest.cs =================================================================== diff -u -rcd709418712e8fa50e2e8a0da0e2488139ac9054 -ra3c8c0cb4384de51a18d77cc7bea487f97ba21e1 --- Core/Common/test/Core.Common.IO.Test/Exceptions/CriticalFileReadExceptionTest.cs (.../CriticalFileReadExceptionTest.cs) (revision cd709418712e8fa50e2e8a0da0e2488139ac9054) +++ Core/Common/test/Core.Common.IO.Test/Exceptions/CriticalFileReadExceptionTest.cs (.../CriticalFileReadExceptionTest.cs) (revision a3c8c0cb4384de51a18d77cc7bea487f97ba21e1) @@ -82,7 +82,7 @@ Assert.AreEqual(messageText, exception.Message); CollectionAssert.IsEmpty(exception.Data); Assert.IsNull(exception.HelpLink); - Assert.AreEqual(innerException, exception.InnerException); + Assert.AreSame(innerException, exception.InnerException); Assert.IsNull(exception.Source); Assert.IsNull(exception.StackTrace); Assert.IsNull(exception.TargetSite); Index: Core/Common/test/Core.Common.IO.Test/Exceptions/ElementReadExceptionTest.cs =================================================================== diff -u -rcd709418712e8fa50e2e8a0da0e2488139ac9054 -ra3c8c0cb4384de51a18d77cc7bea487f97ba21e1 --- Core/Common/test/Core.Common.IO.Test/Exceptions/ElementReadExceptionTest.cs (.../ElementReadExceptionTest.cs) (revision cd709418712e8fa50e2e8a0da0e2488139ac9054) +++ Core/Common/test/Core.Common.IO.Test/Exceptions/ElementReadExceptionTest.cs (.../ElementReadExceptionTest.cs) (revision a3c8c0cb4384de51a18d77cc7bea487f97ba21e1) @@ -63,7 +63,7 @@ Assert.AreEqual(messageText, exception.Message); CollectionAssert.IsEmpty(exception.Data); Assert.IsNull(exception.HelpLink); - Assert.AreEqual(innerException, exception.InnerException); + Assert.AreSame(innerException, exception.InnerException); Assert.IsNull(exception.Source); Assert.IsNull(exception.StackTrace); Assert.IsNull(exception.TargetSite); Index: Core/Components/src/Core.Components.DotSpatial.Forms/Core.Components.DotSpatial.Forms.csproj =================================================================== diff -u -r9f8c22d452747d0d7b435f91f4a44b0b89714089 -ra3c8c0cb4384de51a18d77cc7bea487f97ba21e1 --- Core/Components/src/Core.Components.DotSpatial.Forms/Core.Components.DotSpatial.Forms.csproj (.../Core.Components.DotSpatial.Forms.csproj) (revision 9f8c22d452747d0d7b435f91f4a44b0b89714089) +++ Core/Components/src/Core.Components.DotSpatial.Forms/Core.Components.DotSpatial.Forms.csproj (.../Core.Components.DotSpatial.Forms.csproj) (revision a3c8c0cb4384de51a18d77cc7bea487f97ba21e1) @@ -85,11 +85,6 @@ - - - - - Index: Core/Components/src/Core.Components.DotSpatial/Converter/IMapDataConverter.cs =================================================================== diff -u -r61f3b606ba0003553fe583462bab6e493043be5e -ra3c8c0cb4384de51a18d77cc7bea487f97ba21e1 --- Core/Components/src/Core.Components.DotSpatial/Converter/IMapDataConverter.cs (.../IMapDataConverter.cs) (revision 61f3b606ba0003553fe583462bab6e493043be5e) +++ Core/Components/src/Core.Components.DotSpatial/Converter/IMapDataConverter.cs (.../IMapDataConverter.cs) (revision a3c8c0cb4384de51a18d77cc7bea487f97ba21e1) @@ -29,14 +29,14 @@ namespace Core.Components.DotSpatial.Converter { /// - /// The interface for a converter which converts into . + /// The interface for a converter which converts into . /// public interface IMapDataConverter { /// /// Checks whether the can convert the . /// - /// The to check for. + /// The to check for. /// true if the can be converted by the /// , false otherwise. bool CanConvertMapData(MapData data); Index: Core/Components/src/Core.Components.DotSpatial/Converter/MapDataCollectionConverter.cs =================================================================== diff -u -r61f3b606ba0003553fe583462bab6e493043be5e -ra3c8c0cb4384de51a18d77cc7bea487f97ba21e1 --- Core/Components/src/Core.Components.DotSpatial/Converter/MapDataCollectionConverter.cs (.../MapDataCollectionConverter.cs) (revision 61f3b606ba0003553fe583462bab6e493043be5e) +++ Core/Components/src/Core.Components.DotSpatial/Converter/MapDataCollectionConverter.cs (.../MapDataCollectionConverter.cs) (revision a3c8c0cb4384de51a18d77cc7bea487f97ba21e1) @@ -29,7 +29,7 @@ namespace Core.Components.DotSpatial.Converter { /// - /// The converter that converts in into one or more . + /// The converter that converts in into one or more . /// public class MapDataCollectionConverter : MapDataConverter { Index: Core/Components/src/Core.Components.DotSpatial/Converter/MapDataConverter.cs =================================================================== diff -u -racbd08302b69fc06e5cade26def0dea4d35e3b92 -ra3c8c0cb4384de51a18d77cc7bea487f97ba21e1 --- Core/Components/src/Core.Components.DotSpatial/Converter/MapDataConverter.cs (.../MapDataConverter.cs) (revision acbd08302b69fc06e5cade26def0dea4d35e3b92) +++ Core/Components/src/Core.Components.DotSpatial/Converter/MapDataConverter.cs (.../MapDataConverter.cs) (revision a3c8c0cb4384de51a18d77cc7bea487f97ba21e1) @@ -29,7 +29,7 @@ namespace Core.Components.DotSpatial.Converter { /// - /// The abstract base class for transforming in specific instances. + /// The abstract base class for transforming in specific instances. /// public abstract class MapDataConverter : IMapDataConverter where T : MapData { Index: Core/Components/src/Core.Components.DotSpatial/Converter/MapDataFactory.cs =================================================================== diff -u -r61f3b606ba0003553fe583462bab6e493043be5e -ra3c8c0cb4384de51a18d77cc7bea487f97ba21e1 --- Core/Components/src/Core.Components.DotSpatial/Converter/MapDataFactory.cs (.../MapDataFactory.cs) (revision 61f3b606ba0003553fe583462bab6e493043be5e) +++ Core/Components/src/Core.Components.DotSpatial/Converter/MapDataFactory.cs (.../MapDataFactory.cs) (revision a3c8c0cb4384de51a18d77cc7bea487f97ba21e1) @@ -30,12 +30,12 @@ namespace Core.Components.DotSpatial.Converter { /// - /// A factory to create data from which can be used on the map. + /// A factory to create data from which can be used on the map. /// public class MapDataFactory { /// - /// Collection of converters that the can use to transform . + /// Collection of converters that the can use to transform . /// private readonly IEnumerable converters = new Collection { @@ -48,7 +48,7 @@ /// /// Creates one or more new from the given . /// - /// The to base the creation of upon. + /// The to base the creation of upon. /// A new of . /// Thrown when the given type is not supported. public IList Create(MapData data) Index: Core/Components/src/Core.Components.DotSpatial/Converter/MapLineDataConverter.cs =================================================================== diff -u -r61f3b606ba0003553fe583462bab6e493043be5e -ra3c8c0cb4384de51a18d77cc7bea487f97ba21e1 --- Core/Components/src/Core.Components.DotSpatial/Converter/MapLineDataConverter.cs (.../MapLineDataConverter.cs) (revision 61f3b606ba0003553fe583462bab6e493043be5e) +++ Core/Components/src/Core.Components.DotSpatial/Converter/MapLineDataConverter.cs (.../MapLineDataConverter.cs) (revision a3c8c0cb4384de51a18d77cc7bea487f97ba21e1) @@ -30,7 +30,7 @@ namespace Core.Components.DotSpatial.Converter { /// - /// The converter that converts into a containing a . + /// The converter that converts into a containing a . /// public class MapLineDataConverter : MapDataConverter { Index: Core/Components/src/Core.Components.DotSpatial/Converter/MapPointDataConverter.cs =================================================================== diff -u -r61f3b606ba0003553fe583462bab6e493043be5e -ra3c8c0cb4384de51a18d77cc7bea487f97ba21e1 --- Core/Components/src/Core.Components.DotSpatial/Converter/MapPointDataConverter.cs (.../MapPointDataConverter.cs) (revision 61f3b606ba0003553fe583462bab6e493043be5e) +++ Core/Components/src/Core.Components.DotSpatial/Converter/MapPointDataConverter.cs (.../MapPointDataConverter.cs) (revision a3c8c0cb4384de51a18d77cc7bea487f97ba21e1) @@ -29,7 +29,7 @@ namespace Core.Components.DotSpatial.Converter { /// - /// The converter that converts into a containing one or more . + /// The converter that converts into a containing one or more . /// public class MapPointDataConverter : MapDataConverter { Index: Core/Components/src/Core.Components.DotSpatial/Converter/MapPolygonDataConverter.cs =================================================================== diff -u -r61f3b606ba0003553fe583462bab6e493043be5e -ra3c8c0cb4384de51a18d77cc7bea487f97ba21e1 --- Core/Components/src/Core.Components.DotSpatial/Converter/MapPolygonDataConverter.cs (.../MapPolygonDataConverter.cs) (revision 61f3b606ba0003553fe583462bab6e493043be5e) +++ Core/Components/src/Core.Components.DotSpatial/Converter/MapPolygonDataConverter.cs (.../MapPolygonDataConverter.cs) (revision a3c8c0cb4384de51a18d77cc7bea487f97ba21e1) @@ -30,7 +30,7 @@ namespace Core.Components.DotSpatial.Converter { /// - /// The converter that converts into a containing a . + /// The converter that converts into a containing a . /// public class MapPolygonDataConverter : MapDataConverter { Index: Core/Components/src/Core.Components.Gis.IO/PolylineShapeFileReader.cs =================================================================== diff -u -rcd709418712e8fa50e2e8a0da0e2488139ac9054 -ra3c8c0cb4384de51a18d77cc7bea487f97ba21e1 --- Core/Components/src/Core.Components.Gis.IO/PolylineShapeFileReader.cs (.../PolylineShapeFileReader.cs) (revision cd709418712e8fa50e2e8a0da0e2488139ac9054) +++ Core/Components/src/Core.Components.Gis.IO/PolylineShapeFileReader.cs (.../PolylineShapeFileReader.cs) (revision a3c8c0cb4384de51a18d77cc7bea487f97ba21e1) @@ -37,7 +37,7 @@ namespace Core.Components.Gis.IO { /// - /// Class to be used to read polylines from a shape file. + /// Class to be used to read polylines from a shapefile. /// public class PolylineShapeFileReader : IDisposable { @@ -48,7 +48,7 @@ /// /// Initializes a new instance of the class. /// - /// The shape file path. + /// The shapefile path. /// When is invalid. /// When either: /// @@ -85,7 +85,7 @@ } /// - /// Gets the number of lines in the shape file. + /// Gets the number of lines in the shapefile. /// public int GetNumberOfLines() { @@ -96,7 +96,7 @@ /// Reads a line shape from the file. /// /// The representing the read line shape, or - /// null when at the end of the shape file. + /// null when at the end of the shapefile. /// When reading a multi-line feature. public MapLineData ReadLine() { @@ -107,7 +107,7 @@ try { - var lineFeature = GetSingleLineFeature(readIndex); + IFeature lineFeature = GetSingleLineFeature(readIndex); return ConvertSingleLineFeatureToMapLineData(lineFeature); } finally @@ -137,7 +137,7 @@ private MapLineData ConvertSingleLineFeatureToMapLineData(IFeature lineFeature) { - var lineData = new MapLineData(lineFeature.Coordinates.Select(c => new Tuple(c.X, c.Y))); + var lineData = new MapLineData(lineFeature.Coordinates.Select(c => Tuple.Create(c.X, c.Y))); DataTable table = lineShapeFile.GetAttributes(readIndex, 1); DataRow dataRow = table.Rows[0]; for (int i = 0; i < table.Columns.Count; i++) Index: Core/Components/src/Core.Components.Gis.IO/Properties/Resources.Designer.cs =================================================================== diff -u -rcd709418712e8fa50e2e8a0da0e2488139ac9054 -ra3c8c0cb4384de51a18d77cc7bea487f97ba21e1 --- Core/Components/src/Core.Components.Gis.IO/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision cd709418712e8fa50e2e8a0da0e2488139ac9054) +++ Core/Components/src/Core.Components.Gis.IO/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision a3c8c0cb4384de51a18d77cc7bea487f97ba21e1) @@ -79,7 +79,7 @@ } /// - /// Looks up a localized string similar to Ingelezen element is een 'multi-lijn'; Alleen enkelvoudige lijn elementen worden ondersteund.. + /// Looks up a localized string similar to Ingelezen element is een 'multi-lijn'; alleen enkelvoudige lijn elementen worden ondersteund.. /// internal static string PolylineShapeFileReader_ReadLine_Read_unsupported_multipolyline { get { Index: Core/Components/src/Core.Components.Gis.IO/Properties/Resources.resx =================================================================== diff -u -rcd709418712e8fa50e2e8a0da0e2488139ac9054 -ra3c8c0cb4384de51a18d77cc7bea487f97ba21e1 --- Core/Components/src/Core.Components.Gis.IO/Properties/Resources.resx (.../Resources.resx) (revision cd709418712e8fa50e2e8a0da0e2488139ac9054) +++ Core/Components/src/Core.Components.Gis.IO/Properties/Resources.resx (.../Resources.resx) (revision a3c8c0cb4384de51a18d77cc7bea487f97ba21e1) @@ -121,7 +121,7 @@ Bestand bevat geometrieën die geen lijn zijn. - Ingelezen element is een 'multi-lijn'; Alleen enkelvoudige lijn elementen worden ondersteund. + Ingelezen element is een 'multi-lijn'; alleen enkelvoudige lijn elementen worden ondersteund. op index {0} Index: Core/Components/test/Core.Components.Charting.Test/Data/AreaDataTest.cs =================================================================== diff -u -race2d2aedcb70dbf614869b58145aec35d233c08 -ra3c8c0cb4384de51a18d77cc7bea487f97ba21e1 --- Core/Components/test/Core.Components.Charting.Test/Data/AreaDataTest.cs (.../AreaDataTest.cs) (revision ace2d2aedcb70dbf614869b58145aec35d233c08) +++ Core/Components/test/Core.Components.Charting.Test/Data/AreaDataTest.cs (.../AreaDataTest.cs) (revision a3c8c0cb4384de51a18d77cc7bea487f97ba21e1) @@ -51,9 +51,9 @@ { return new Collection> { - new Tuple(0.0, 1.1), - new Tuple(1.0, 2.1), - new Tuple(1.6, 1.6) + Tuple.Create(0.0, 1.1), + Tuple.Create(1.0, 2.1), + Tuple.Create(1.6, 1.6) }; } } Index: Core/Components/test/Core.Components.Charting.Test/Data/LineDataTest.cs =================================================================== diff -u -rce6b88b227d337f33b2566122b8624f9a74a3711 -ra3c8c0cb4384de51a18d77cc7bea487f97ba21e1 --- Core/Components/test/Core.Components.Charting.Test/Data/LineDataTest.cs (.../LineDataTest.cs) (revision ce6b88b227d337f33b2566122b8624f9a74a3711) +++ Core/Components/test/Core.Components.Charting.Test/Data/LineDataTest.cs (.../LineDataTest.cs) (revision a3c8c0cb4384de51a18d77cc7bea487f97ba21e1) @@ -51,9 +51,9 @@ { return new Collection> { - new Tuple(0.0, 1.1), - new Tuple(1.0, 2.1), - new Tuple(1.6, 1.6) + Tuple.Create(0.0, 1.1), + Tuple.Create(1.0, 2.1), + Tuple.Create(1.6, 1.6) }; } } Index: Core/Components/test/Core.Components.Charting.Test/Data/PointDataTest.cs =================================================================== diff -u -rce6b88b227d337f33b2566122b8624f9a74a3711 -ra3c8c0cb4384de51a18d77cc7bea487f97ba21e1 --- Core/Components/test/Core.Components.Charting.Test/Data/PointDataTest.cs (.../PointDataTest.cs) (revision ce6b88b227d337f33b2566122b8624f9a74a3711) +++ Core/Components/test/Core.Components.Charting.Test/Data/PointDataTest.cs (.../PointDataTest.cs) (revision a3c8c0cb4384de51a18d77cc7bea487f97ba21e1) @@ -51,9 +51,9 @@ { return new Collection> { - new Tuple(0.0, 1.1), - new Tuple(1.0, 2.1), - new Tuple(1.6, 1.6) + Tuple.Create(0.0, 1.1), + Tuple.Create(1.0, 2.1), + Tuple.Create(1.6, 1.6) }; } } Index: Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapDataCollectionConverterTest.cs =================================================================== diff -u -r61f3b606ba0003553fe583462bab6e493043be5e -ra3c8c0cb4384de51a18d77cc7bea487f97ba21e1 --- Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapDataCollectionConverterTest.cs (.../MapDataCollectionConverterTest.cs) (revision 61f3b606ba0003553fe583462bab6e493043be5e) +++ Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapDataCollectionConverterTest.cs (.../MapDataCollectionConverterTest.cs) (revision a3c8c0cb4384de51a18d77cc7bea487f97ba21e1) @@ -96,8 +96,8 @@ for (int i = 0; i < randomCount; i++) { - points.Add(new Tuple(random.NextDouble(), random.NextDouble())); - linePoints.Add(new Tuple(random.NextDouble(), random.NextDouble())); + points.Add(Tuple.Create(random.NextDouble(), random.NextDouble())); + linePoints.Add(Tuple.Create(random.NextDouble(), random.NextDouble())); } var collectionData = new MapDataCollection(new List()); Index: Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapDataFactoryTest.cs =================================================================== diff -u -r61f3b606ba0003553fe583462bab6e493043be5e -ra3c8c0cb4384de51a18d77cc7bea487f97ba21e1 --- Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapDataFactoryTest.cs (.../MapDataFactoryTest.cs) (revision 61f3b606ba0003553fe583462bab6e493043be5e) +++ Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapDataFactoryTest.cs (.../MapDataFactoryTest.cs) (revision a3c8c0cb4384de51a18d77cc7bea487f97ba21e1) @@ -128,9 +128,9 @@ { return new Collection> { - new Tuple(1.2, 3.4), - new Tuple(3.2, 3.4), - new Tuple(0.2, 2.4) + Tuple.Create(1.2, 3.4), + Tuple.Create(3.2, 3.4), + Tuple.Create(0.2, 2.4) }; } } Index: Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapLineDataConverterTest.cs =================================================================== diff -u -r61f3b606ba0003553fe583462bab6e493043be5e -ra3c8c0cb4384de51a18d77cc7bea487f97ba21e1 --- Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapLineDataConverterTest.cs (.../MapLineDataConverterTest.cs) (revision 61f3b606ba0003553fe583462bab6e493043be5e) +++ Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapLineDataConverterTest.cs (.../MapLineDataConverterTest.cs) (revision a3c8c0cb4384de51a18d77cc7bea487f97ba21e1) @@ -95,7 +95,7 @@ for (int i = 0; i < randomCount; i++) { - points.Add(new Tuple(random.NextDouble(), random.NextDouble())); + points.Add(Tuple.Create(random.NextDouble(), random.NextDouble())); } var lineData = new MapLineData(points); Index: Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapPointDataConverterTest.cs =================================================================== diff -u -r61f3b606ba0003553fe583462bab6e493043be5e -ra3c8c0cb4384de51a18d77cc7bea487f97ba21e1 --- Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapPointDataConverterTest.cs (.../MapPointDataConverterTest.cs) (revision 61f3b606ba0003553fe583462bab6e493043be5e) +++ Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapPointDataConverterTest.cs (.../MapPointDataConverterTest.cs) (revision a3c8c0cb4384de51a18d77cc7bea487f97ba21e1) @@ -65,7 +65,7 @@ for (int i = 0; i < randomCount; i++) { - points.Add(new Tuple(random.NextDouble(), random.NextDouble())); + points.Add(Tuple.Create(random.NextDouble(), random.NextDouble())); } var pointData = new MapPointData(points); Index: Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapPolygonDataConverterTest.cs =================================================================== diff -u -r61f3b606ba0003553fe583462bab6e493043be5e -ra3c8c0cb4384de51a18d77cc7bea487f97ba21e1 --- Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapPolygonDataConverterTest.cs (.../MapPolygonDataConverterTest.cs) (revision 61f3b606ba0003553fe583462bab6e493043be5e) +++ Core/Components/test/Core.Components.DotSpatial.Test/Converter/MapPolygonDataConverterTest.cs (.../MapPolygonDataConverterTest.cs) (revision a3c8c0cb4384de51a18d77cc7bea487f97ba21e1) @@ -64,7 +64,7 @@ for (int i = 0; i < randomCount; i++) { - polygonPoints.Add(new Tuple(random.NextDouble(), random.NextDouble())); + polygonPoints.Add(Tuple.Create(random.NextDouble(), random.NextDouble())); } var polygonData = new MapPolygonData(polygonPoints); Index: Core/Components/test/Core.Components.DotSpatial.TestUtil/TestMapData.cs =================================================================== diff -u -r61f3b606ba0003553fe583462bab6e493043be5e -ra3c8c0cb4384de51a18d77cc7bea487f97ba21e1 --- Core/Components/test/Core.Components.DotSpatial.TestUtil/TestMapData.cs (.../TestMapData.cs) (revision 61f3b606ba0003553fe583462bab6e493043be5e) +++ Core/Components/test/Core.Components.DotSpatial.TestUtil/TestMapData.cs (.../TestMapData.cs) (revision a3c8c0cb4384de51a18d77cc7bea487f97ba21e1) @@ -3,7 +3,7 @@ namespace Core.Components.DotSpatial.TestUtil { /// - /// A class representing a implementation which is not in the regular codebase. + /// A class representing a implementation which is not in the regular codebase. /// public class TestMapData : MapData {} } \ No newline at end of file Index: Core/Components/test/Core.Components.Gis.IO.Test/PolylineShapeFileReaderTest.cs =================================================================== diff -u -reb0fa1ad33501642b7cd6c7639155f9f83fd50b4 -ra3c8c0cb4384de51a18d77cc7bea487f97ba21e1 --- Core/Components/test/Core.Components.Gis.IO.Test/PolylineShapeFileReaderTest.cs (.../PolylineShapeFileReaderTest.cs) (revision eb0fa1ad33501642b7cd6c7639155f9f83fd50b4) +++ Core/Components/test/Core.Components.Gis.IO.Test/PolylineShapeFileReaderTest.cs (.../PolylineShapeFileReaderTest.cs) (revision a3c8c0cb4384de51a18d77cc7bea487f97ba21e1) @@ -296,7 +296,7 @@ TestDelegate call = () => reader.ReadLine(); // Assert - var expectedMessage = string.Format("Fout bij het lezen van bestand '{0}' op index 0: Ingelezen element is een 'multi-lijn'; Alleen enkelvoudige lijn elementen worden ondersteund.", + var expectedMessage = string.Format("Fout bij het lezen van bestand '{0}' op index 0: Ingelezen element is een 'multi-lijn'; alleen enkelvoudige lijn elementen worden ondersteund.", nonLineShapeFile); var message = Assert.Throws(call).Message; Assert.AreEqual(expectedMessage, message); Index: Core/Components/test/Core.Components.Gis.Test/Core.Components.Gis.Test.csproj =================================================================== diff -u -rf612f81e3d6435ddd1a9c571738aab54e6048a9e -ra3c8c0cb4384de51a18d77cc7bea487f97ba21e1 --- Core/Components/test/Core.Components.Gis.Test/Core.Components.Gis.Test.csproj (.../Core.Components.Gis.Test.csproj) (revision f612f81e3d6435ddd1a9c571738aab54e6048a9e) +++ Core/Components/test/Core.Components.Gis.Test/Core.Components.Gis.Test.csproj (.../Core.Components.Gis.Test.csproj) (revision a3c8c0cb4384de51a18d77cc7bea487f97ba21e1) @@ -39,11 +39,6 @@ - - - - - Index: Core/Components/test/Core.Components.Gis.Test/Data/MapLineDataTest.cs =================================================================== diff -u -rdb6ab4e99bb2e88eb22d5706cc7ebca95982387b -ra3c8c0cb4384de51a18d77cc7bea487f97ba21e1 --- Core/Components/test/Core.Components.Gis.Test/Data/MapLineDataTest.cs (.../MapLineDataTest.cs) (revision db6ab4e99bb2e88eb22d5706cc7ebca95982387b) +++ Core/Components/test/Core.Components.Gis.Test/Data/MapLineDataTest.cs (.../MapLineDataTest.cs) (revision a3c8c0cb4384de51a18d77cc7bea487f97ba21e1) @@ -73,9 +73,9 @@ { return new Collection> { - new Tuple(0.0, 1.1), - new Tuple(1.0, 2.1), - new Tuple(1.6, 1.6) + Tuple.Create(0.0, 1.1), + Tuple.Create(1.0, 2.1), + Tuple.Create(1.6, 1.6) }; } } Index: Core/Components/test/Core.Components.Gis.Test/Data/MapPointDataTest.cs =================================================================== diff -u -rf612f81e3d6435ddd1a9c571738aab54e6048a9e -ra3c8c0cb4384de51a18d77cc7bea487f97ba21e1 --- Core/Components/test/Core.Components.Gis.Test/Data/MapPointDataTest.cs (.../MapPointDataTest.cs) (revision f612f81e3d6435ddd1a9c571738aab54e6048a9e) +++ Core/Components/test/Core.Components.Gis.Test/Data/MapPointDataTest.cs (.../MapPointDataTest.cs) (revision a3c8c0cb4384de51a18d77cc7bea487f97ba21e1) @@ -54,9 +54,9 @@ { return new Collection> { - new Tuple(0.0, 1.1), - new Tuple(1.0, 2.1), - new Tuple(1.6, 1.6) + Tuple.Create(0.0, 1.1), + Tuple.Create(1.0, 2.1), + Tuple.Create(1.6, 1.6) }; } } Index: Core/Components/test/Core.Components.Gis.Test/Data/MapPolygonDataTest.cs =================================================================== diff -u -rf612f81e3d6435ddd1a9c571738aab54e6048a9e -ra3c8c0cb4384de51a18d77cc7bea487f97ba21e1 --- Core/Components/test/Core.Components.Gis.Test/Data/MapPolygonDataTest.cs (.../MapPolygonDataTest.cs) (revision f612f81e3d6435ddd1a9c571738aab54e6048a9e) +++ Core/Components/test/Core.Components.Gis.Test/Data/MapPolygonDataTest.cs (.../MapPolygonDataTest.cs) (revision a3c8c0cb4384de51a18d77cc7bea487f97ba21e1) @@ -54,9 +54,9 @@ { return new Collection> { - new Tuple(0.0, 1.1), - new Tuple(1.0, 2.1), - new Tuple(1.6, 1.6) + Tuple.Create(0.0, 1.1), + Tuple.Create(1.0, 2.1), + Tuple.Create(1.6, 1.6) }; } } Index: Core/Components/test/Core.Components.OxyPlot.Test/Converter/AreaDataConverterTest.cs =================================================================== diff -u -rc5672681b9872a622ff718acd6975118ad59474f -ra3c8c0cb4384de51a18d77cc7bea487f97ba21e1 --- Core/Components/test/Core.Components.OxyPlot.Test/Converter/AreaDataConverterTest.cs (.../AreaDataConverterTest.cs) (revision c5672681b9872a622ff718acd6975118ad59474f) +++ Core/Components/test/Core.Components.OxyPlot.Test/Converter/AreaDataConverterTest.cs (.../AreaDataConverterTest.cs) (revision a3c8c0cb4384de51a18d77cc7bea487f97ba21e1) @@ -64,7 +64,7 @@ for (int i = 0; i < randomCount; i++) { - points.Add(new Tuple(random.NextDouble(), random.NextDouble())); + points.Add(Tuple.Create(random.NextDouble(), random.NextDouble())); } var areaData = new AreaData(points); Index: Core/Components/test/Core.Components.OxyPlot.Test/Converter/ChartDataCollectionConverterTest.cs =================================================================== diff -u -rc5672681b9872a622ff718acd6975118ad59474f -ra3c8c0cb4384de51a18d77cc7bea487f97ba21e1 --- Core/Components/test/Core.Components.OxyPlot.Test/Converter/ChartDataCollectionConverterTest.cs (.../ChartDataCollectionConverterTest.cs) (revision c5672681b9872a622ff718acd6975118ad59474f) +++ Core/Components/test/Core.Components.OxyPlot.Test/Converter/ChartDataCollectionConverterTest.cs (.../ChartDataCollectionConverterTest.cs) (revision a3c8c0cb4384de51a18d77cc7bea487f97ba21e1) @@ -64,8 +64,8 @@ for (int i = 0; i < randomCount; i++) { - pointsArea.Add(new Tuple(random.NextDouble(), random.NextDouble())); - pointsLine.Add(new Tuple(random.NextDouble(), random.NextDouble())); + pointsArea.Add(Tuple.Create(random.NextDouble(), random.NextDouble())); + pointsLine.Add(Tuple.Create(random.NextDouble(), random.NextDouble())); } var collectionData = new ChartDataCollection(new List()); Index: Core/Components/test/Core.Components.OxyPlot.Test/Converter/ChartDataConverterTest.cs =================================================================== diff -u -rc5672681b9872a622ff718acd6975118ad59474f -ra3c8c0cb4384de51a18d77cc7bea487f97ba21e1 --- Core/Components/test/Core.Components.OxyPlot.Test/Converter/ChartDataConverterTest.cs (.../ChartDataConverterTest.cs) (revision c5672681b9872a622ff718acd6975118ad59474f) +++ Core/Components/test/Core.Components.OxyPlot.Test/Converter/ChartDataConverterTest.cs (.../ChartDataConverterTest.cs) (revision a3c8c0cb4384de51a18d77cc7bea487f97ba21e1) @@ -20,7 +20,7 @@ var random = new Random(21); var a = random.NextDouble(); var b = random.NextDouble(); - var tuple = new Tuple(a,b); + var tuple = Tuple.Create(a,b); var testConverter = new TestChartDataConverter(); // Call Index: Core/Components/test/Core.Components.OxyPlot.Test/Converter/LineDataConverterTest.cs =================================================================== diff -u -rc5672681b9872a622ff718acd6975118ad59474f -ra3c8c0cb4384de51a18d77cc7bea487f97ba21e1 --- Core/Components/test/Core.Components.OxyPlot.Test/Converter/LineDataConverterTest.cs (.../LineDataConverterTest.cs) (revision c5672681b9872a622ff718acd6975118ad59474f) +++ Core/Components/test/Core.Components.OxyPlot.Test/Converter/LineDataConverterTest.cs (.../LineDataConverterTest.cs) (revision a3c8c0cb4384de51a18d77cc7bea487f97ba21e1) @@ -62,7 +62,7 @@ for (int i = 0; i < randomCount; i++) { - points.Add(new Tuple(random.NextDouble(), random.NextDouble())); + points.Add(Tuple.Create(random.NextDouble(), random.NextDouble())); } var lineData = new LineData(points); Index: Core/Components/test/Core.Components.OxyPlot.Test/Converter/PointDataConverterTest.cs =================================================================== diff -u -rc5672681b9872a622ff718acd6975118ad59474f -ra3c8c0cb4384de51a18d77cc7bea487f97ba21e1 --- Core/Components/test/Core.Components.OxyPlot.Test/Converter/PointDataConverterTest.cs (.../PointDataConverterTest.cs) (revision c5672681b9872a622ff718acd6975118ad59474f) +++ Core/Components/test/Core.Components.OxyPlot.Test/Converter/PointDataConverterTest.cs (.../PointDataConverterTest.cs) (revision a3c8c0cb4384de51a18d77cc7bea487f97ba21e1) @@ -63,7 +63,7 @@ for (int i = 0; i < randomCount; i++) { - points.Add(new Tuple(random.NextDouble(), random.NextDouble())); + points.Add(Tuple.Create(random.NextDouble(), random.NextDouble())); } var pointData = new PointData(points); Index: Core/Components/test/Core.Components.OxyPlot.Test/Converter/SeriesFactoryTest.cs =================================================================== diff -u -rfc0a61c81da4dcf9f436c8b8bd9c51c6b4d65ef8 -ra3c8c0cb4384de51a18d77cc7bea487f97ba21e1 --- Core/Components/test/Core.Components.OxyPlot.Test/Converter/SeriesFactoryTest.cs (.../SeriesFactoryTest.cs) (revision fc0a61c81da4dcf9f436c8b8bd9c51c6b4d65ef8) +++ Core/Components/test/Core.Components.OxyPlot.Test/Converter/SeriesFactoryTest.cs (.../SeriesFactoryTest.cs) (revision a3c8c0cb4384de51a18d77cc7bea487f97ba21e1) @@ -95,9 +95,9 @@ { return new Collection> { - new Tuple(1.2, 3.4), - new Tuple(3.2, 3.4), - new Tuple(0.2, 2.4) + Tuple.Create(1.2, 3.4), + Tuple.Create(3.2, 3.4), + Tuple.Create(0.2, 2.4) }; } } Index: Core/Plugins/src/Core.Plugins.DotSpatial/Core.Plugins.DotSpatial.csproj =================================================================== diff -u -r9f8c22d452747d0d7b435f91f4a44b0b89714089 -ra3c8c0cb4384de51a18d77cc7bea487f97ba21e1 --- Core/Plugins/src/Core.Plugins.DotSpatial/Core.Plugins.DotSpatial.csproj (.../Core.Plugins.DotSpatial.csproj) (revision 9f8c22d452747d0d7b435f91f4a44b0b89714089) +++ Core/Plugins/src/Core.Plugins.DotSpatial/Core.Plugins.DotSpatial.csproj (.../Core.Plugins.DotSpatial.csproj) (revision a3c8c0cb4384de51a18d77cc7bea487f97ba21e1) @@ -101,11 +101,6 @@ {5a91174a-fb95-4c9d-9ca5-81c0b8d4361a} Core.Components.DotSpatial.Forms - - {aa47e858-a2a7-470e-8b2d-c76ae8ed9ccd} - Core.Components.DotSpatial - False - {318ba582-88c9-4816-a54a-a7e431461de3} Core.Components.Gis Index: Core/Plugins/src/Core.Plugins.DotSpatial/Forms/IMapView.cs =================================================================== diff -u -r61f3b606ba0003553fe583462bab6e493043be5e -ra3c8c0cb4384de51a18d77cc7bea487f97ba21e1 --- Core/Plugins/src/Core.Plugins.DotSpatial/Forms/IMapView.cs (.../IMapView.cs) (revision 61f3b606ba0003553fe583462bab6e493043be5e) +++ Core/Plugins/src/Core.Plugins.DotSpatial/Forms/IMapView.cs (.../IMapView.cs) (revision a3c8c0cb4384de51a18d77cc7bea487f97ba21e1) @@ -25,12 +25,12 @@ namespace Core.Plugins.DotSpatial.Forms { /// - /// Interface describing that contain a as one of its components. + /// Interface describing that contain a as one of its components. /// public interface IMapView : IView { /// - /// Gets the set for this . + /// Gets the set for this . /// IMap Map { get; } } Index: Core/Plugins/src/Core.Plugins.DotSpatial/Legend/MapLegendController.cs =================================================================== diff -u -r61f3b606ba0003553fe583462bab6e493043be5e -ra3c8c0cb4384de51a18d77cc7bea487f97ba21e1 --- Core/Plugins/src/Core.Plugins.DotSpatial/Legend/MapLegendController.cs (.../MapLegendController.cs) (revision 61f3b606ba0003553fe583462bab6e493043be5e) +++ Core/Plugins/src/Core.Plugins.DotSpatial/Legend/MapLegendController.cs (.../MapLegendController.cs) (revision a3c8c0cb4384de51a18d77cc7bea487f97ba21e1) @@ -76,8 +76,8 @@ /// /// Updates the data for the if it is open. /// - /// The to show. If null the - /// data will be cleared. + /// The to show. If null the data + /// will be cleared. public void Update(MapData data) { if (IsLegendViewOpen()) Index: Core/Plugins/src/Core.Plugins.DotSpatial/Legend/MapLegendView.cs =================================================================== diff -u -rf02506e58ebeecd95383ae12f4df2570ae5af17c -ra3c8c0cb4384de51a18d77cc7bea487f97ba21e1 --- Core/Plugins/src/Core.Plugins.DotSpatial/Legend/MapLegendView.cs (.../MapLegendView.cs) (revision f02506e58ebeecd95383ae12f4df2570ae5af17c) +++ Core/Plugins/src/Core.Plugins.DotSpatial/Legend/MapLegendView.cs (.../MapLegendView.cs) (revision a3c8c0cb4384de51a18d77cc7bea487f97ba21e1) @@ -23,7 +23,6 @@ using System.Windows.Forms; using Core.Common.Controls.TreeView; using Core.Common.Controls.Views; -using Core.Components.DotSpatial; using Core.Components.DotSpatial.Forms; using Core.Components.Gis.Data; Index: Core/Plugins/src/Core.Plugins.DotSpatial/MapRibbon.xaml.cs =================================================================== diff -u -r61f3b606ba0003553fe583462bab6e493043be5e -ra3c8c0cb4384de51a18d77cc7bea487f97ba21e1 --- Core/Plugins/src/Core.Plugins.DotSpatial/MapRibbon.xaml.cs (.../MapRibbon.xaml.cs) (revision 61f3b606ba0003553fe583462bab6e493043be5e) +++ Core/Plugins/src/Core.Plugins.DotSpatial/MapRibbon.xaml.cs (.../MapRibbon.xaml.cs) (revision a3c8c0cb4384de51a18d77cc7bea487f97ba21e1) @@ -45,7 +45,7 @@ } /// - /// Sets the to show the ribbon for. + /// Sets the to show the ribbon for. /// public IMap Map { Index: Core/Plugins/test/Core.Plugins.DotSpatial.Test/Core.Plugins.DotSpatial.Test.csproj =================================================================== diff -u -r9f8c22d452747d0d7b435f91f4a44b0b89714089 -ra3c8c0cb4384de51a18d77cc7bea487f97ba21e1 --- Core/Plugins/test/Core.Plugins.DotSpatial.Test/Core.Plugins.DotSpatial.Test.csproj (.../Core.Plugins.DotSpatial.Test.csproj) (revision 9f8c22d452747d0d7b435f91f4a44b0b89714089) +++ Core/Plugins/test/Core.Plugins.DotSpatial.Test/Core.Plugins.DotSpatial.Test.csproj (.../Core.Plugins.DotSpatial.Test.csproj) (revision a3c8c0cb4384de51a18d77cc7bea487f97ba21e1) @@ -112,10 +112,6 @@ {5a91174a-fb95-4c9d-9ca5-81c0b8d4361a} Core.Components.DotSpatial.Forms - - {AA47E858-A2A7-470E-8B2D-C76AE8ED9CCD} - Core.Components.DotSpatial - {318ba582-88c9-4816-a54a-a7e431461de3} Core.Components.Gis Index: Core/Plugins/test/Core.Plugins.DotSpatial.Test/DotSpatialGuiPluginTest.cs =================================================================== diff -u -r9f8c22d452747d0d7b435f91f4a44b0b89714089 -ra3c8c0cb4384de51a18d77cc7bea487f97ba21e1 --- Core/Plugins/test/Core.Plugins.DotSpatial.Test/DotSpatialGuiPluginTest.cs (.../DotSpatialGuiPluginTest.cs) (revision 9f8c22d452747d0d7b435f91f4a44b0b89714089) +++ Core/Plugins/test/Core.Plugins.DotSpatial.Test/DotSpatialGuiPluginTest.cs (.../DotSpatialGuiPluginTest.cs) (revision a3c8c0cb4384de51a18d77cc7bea487f97ba21e1) @@ -8,7 +8,6 @@ using Core.Common.Gui.Forms.MainWindow; using Core.Common.Gui.Plugin; using Core.Common.Gui.Settings; -using Core.Components.DotSpatial; using Core.Components.DotSpatial.Forms; using Core.Components.DotSpatial.TestUtil; using Core.Components.Gis; Index: Core/Plugins/test/Core.Plugins.DotSpatial.Test/Forms/MapDataViewTest.cs =================================================================== diff -u -r9f8c22d452747d0d7b435f91f4a44b0b89714089 -ra3c8c0cb4384de51a18d77cc7bea487f97ba21e1 --- Core/Plugins/test/Core.Plugins.DotSpatial.Test/Forms/MapDataViewTest.cs (.../MapDataViewTest.cs) (revision 9f8c22d452747d0d7b435f91f4a44b0b89714089) +++ Core/Plugins/test/Core.Plugins.DotSpatial.Test/Forms/MapDataViewTest.cs (.../MapDataViewTest.cs) (revision a3c8c0cb4384de51a18d77cc7bea487f97ba21e1) @@ -2,7 +2,6 @@ using System.Linq; using System.Windows.Forms; using Core.Common.Controls.Views; -using Core.Components.DotSpatial; using Core.Components.DotSpatial.Forms; using Core.Components.Gis.Data; using Core.Plugins.DotSpatial.Forms; Index: Core/Plugins/test/Core.Plugins.DotSpatial.Test/MapRibbonTest.cs =================================================================== diff -u -r61f3b606ba0003553fe583462bab6e493043be5e -ra3c8c0cb4384de51a18d77cc7bea487f97ba21e1 --- Core/Plugins/test/Core.Plugins.DotSpatial.Test/MapRibbonTest.cs (.../MapRibbonTest.cs) (revision 61f3b606ba0003553fe583462bab6e493043be5e) +++ Core/Plugins/test/Core.Plugins.DotSpatial.Test/MapRibbonTest.cs (.../MapRibbonTest.cs) (revision a3c8c0cb4384de51a18d77cc7bea487f97ba21e1) @@ -4,7 +4,6 @@ using System.Windows.Controls.Primitives; using Core.Common.Controls.Commands; using Core.Common.Gui; -using Core.Components.DotSpatial; using Core.Components.Gis; using Core.Plugins.DotSpatial.Commands; using Core.Plugins.DotSpatial.Legend; Index: Core/Plugins/test/Core.Plugins.DotSpatial.Test/TestMapView.cs =================================================================== diff -u -r9f8c22d452747d0d7b435f91f4a44b0b89714089 -ra3c8c0cb4384de51a18d77cc7bea487f97ba21e1 --- Core/Plugins/test/Core.Plugins.DotSpatial.Test/TestMapView.cs (.../TestMapView.cs) (revision 9f8c22d452747d0d7b435f91f4a44b0b89714089) +++ Core/Plugins/test/Core.Plugins.DotSpatial.Test/TestMapView.cs (.../TestMapView.cs) (revision a3c8c0cb4384de51a18d77cc7bea487f97ba21e1) @@ -1,5 +1,4 @@ using System.Windows.Forms; -using Core.Components.DotSpatial; using Core.Components.DotSpatial.Forms; using Core.Components.Gis; using Core.Plugins.DotSpatial.Forms; Index: Demo/Ringtoets/src/Demo.Ringtoets/Commands/OpenChartViewCommand.cs =================================================================== diff -u -r503ce83bfc5077074351e8d10b18ab8c1343f6b2 -ra3c8c0cb4384de51a18d77cc7bea487f97ba21e1 --- Demo/Ringtoets/src/Demo.Ringtoets/Commands/OpenChartViewCommand.cs (.../OpenChartViewCommand.cs) (revision 503ce83bfc5077074351e8d10b18ab8c1343f6b2) +++ Demo/Ringtoets/src/Demo.Ringtoets/Commands/OpenChartViewCommand.cs (.../OpenChartViewCommand.cs) (revision a3c8c0cb4384de51a18d77cc7bea487f97ba21e1) @@ -43,31 +43,31 @@ { var line = new LineData(new Collection> { - new Tuple(0.0, 1.1), - new Tuple(1.0, 2.1), - new Tuple(1.6, 1.6) + Tuple.Create(0.0, 1.1), + Tuple.Create(1.0, 2.1), + Tuple.Create(1.6, 1.6) }); var area = new AreaData(new Collection> { - new Tuple(0.0, 1.1), - new Tuple(1.0, 2.1), - new Tuple(1.6, 1.6), - new Tuple(1.6, 0.5), - new Tuple(0.0, 0.5), - new Tuple(0.0, 1.1) + Tuple.Create(0.0, 1.1), + Tuple.Create(1.0, 2.1), + Tuple.Create(1.6, 1.6), + Tuple.Create(1.6, 0.5), + Tuple.Create(0.0, 0.5), + Tuple.Create(0.0, 1.1) }); var clearArea = new AreaData(new Collection> { - new Tuple(0.5, 0.5), - new Tuple(0.5, 1.0), - new Tuple(1.0, 1.0), - new Tuple(0.5, 0.5) + Tuple.Create(0.5, 0.5), + Tuple.Create(0.5, 1.0), + Tuple.Create(1.0, 1.0), + Tuple.Create(0.5, 0.5) }); var points = new PointData(new Collection> { - new Tuple(0.0, 1.1), - new Tuple(0.5, 1.6), - new Tuple(1.0, 2.1) + Tuple.Create(0.0, 1.1), + Tuple.Create(0.5, 1.6), + Tuple.Create(1.0, 2.1) }); documentViewController.DocumentViewsResolver.OpenViewForData(new ChartDataCollection(new List { area, clearArea, line, points })); } Index: Demo/Ringtoets/src/Demo.Ringtoets/Commands/OpenMapViewCommand.cs =================================================================== diff -u -r61f3b606ba0003553fe583462bab6e493043be5e -ra3c8c0cb4384de51a18d77cc7bea487f97ba21e1 --- Demo/Ringtoets/src/Demo.Ringtoets/Commands/OpenMapViewCommand.cs (.../OpenMapViewCommand.cs) (revision 61f3b606ba0003553fe583462bab6e493043be5e) +++ Demo/Ringtoets/src/Demo.Ringtoets/Commands/OpenMapViewCommand.cs (.../OpenMapViewCommand.cs) (revision a3c8c0cb4384de51a18d77cc7bea487f97ba21e1) @@ -8,7 +8,7 @@ namespace Demo.Ringtoets.Commands { /// - /// The command for opening a view for with some arbitrary data. + /// The command for opening a view for with some arbitrary data. /// public class OpenMapViewCommand : ICommand { @@ -43,21 +43,21 @@ { var points = new MapPointData(new Collection> { - new Tuple(1.5, 2), - new Tuple(1.1, 1), - new Tuple(0.8, 0.5) + Tuple.Create(1.5, 2.0), + Tuple.Create(1.1, 1.0), + Tuple.Create(0.8, 0.5) }); var lines = new MapLineData(new Collection> { - new Tuple(0.0, 1.1), - new Tuple(1.0, 2.1), - new Tuple(1.6, 1.6) + Tuple.Create(0.0, 1.1), + Tuple.Create(1.0, 2.1), + Tuple.Create(1.6, 1.6) }); var polygons = new MapPolygonData(new Collection> { - new Tuple(1.0, 1.3), - new Tuple(3.0, 2.6), - new Tuple(5.6, 1.6) + Tuple.Create(1.0, 1.3), + Tuple.Create(3.0, 2.6), + Tuple.Create(5.6, 1.6) }); documentViewController.DocumentViewsResolver.OpenViewForData(new MapDataCollection(new List { points, lines, polygons })); Index: Demo/Ringtoets/src/Demo.Ringtoets/Demo.Ringtoets.csproj =================================================================== diff -u -r98fc85d8cecf9edae9fe7c1f2f47b60ecda5e187 -ra3c8c0cb4384de51a18d77cc7bea487f97ba21e1 --- Demo/Ringtoets/src/Demo.Ringtoets/Demo.Ringtoets.csproj (.../Demo.Ringtoets.csproj) (revision 98fc85d8cecf9edae9fe7c1f2f47b60ecda5e187) +++ Demo/Ringtoets/src/Demo.Ringtoets/Demo.Ringtoets.csproj (.../Demo.Ringtoets.csproj) (revision a3c8c0cb4384de51a18d77cc7bea487f97ba21e1) @@ -96,11 +96,6 @@ Core.Components.Charting False - - {AA47E858-A2A7-470E-8B2D-C76AE8ED9CCD} - Core.Components.DotSpatial - False - {318ba582-88c9-4816-a54a-a7e431461de3} Core.Components.Gis @@ -114,10 +109,6 @@ {70F8CC9C-5BC8-4FB2-B201-EAE7FA8088C2} Ringtoets.HydraRing.Data - - {B69D5B6C-6E14-4FA9-9EBC-8F97678CDB70} - Ringtoets.HydraRing.IO - {0A0B4576-1FD4-4836-880C-A7829ACB944A} Ringtoets.HydraRing.Plugin Index: Ringtoets/Common/src/Ringtoets.Common.Data/ReferenceLine.cs =================================================================== diff -u -r249fd5e4604012895724a9d7df67201332c9e7dc -ra3c8c0cb4384de51a18d77cc7bea487f97ba21e1 --- Ringtoets/Common/src/Ringtoets.Common.Data/ReferenceLine.cs (.../ReferenceLine.cs) (revision 249fd5e4604012895724a9d7df67201332c9e7dc) +++ Ringtoets/Common/src/Ringtoets.Common.Data/ReferenceLine.cs (.../ReferenceLine.cs) (revision a3c8c0cb4384de51a18d77cc7bea487f97ba21e1) @@ -30,7 +30,7 @@ namespace Ringtoets.Common.Data { /// - /// Class representing the reference line used a basis for assessment. + /// Class representing the reference line used as a basis for assessment. /// public class ReferenceLine { @@ -51,7 +51,7 @@ /// Sets the geometry of the reference line. /// /// The sequence of points defining the reference line geometry. - /// Thrown when any of the has no value (== null). + /// Thrown when any element of is null. public void SetGeometry(IEnumerable newPoints) { if (newPoints == null) Index: Ringtoets/Common/src/Ringtoets.Common.IO/ReferenceLineReader.cs =================================================================== diff -u -r249fd5e4604012895724a9d7df67201332c9e7dc -ra3c8c0cb4384de51a18d77cc7bea487f97ba21e1 --- Ringtoets/Common/src/Ringtoets.Common.IO/ReferenceLineReader.cs (.../ReferenceLineReader.cs) (revision 249fd5e4604012895724a9d7df67201332c9e7dc) +++ Ringtoets/Common/src/Ringtoets.Common.IO/ReferenceLineReader.cs (.../ReferenceLineReader.cs) (revision a3c8c0cb4384de51a18d77cc7bea487f97ba21e1) @@ -43,11 +43,10 @@ public class ReferenceLineReader { /// - /// Reads an instance of from a shape file that should - /// contain one polyline. + /// Reads an instance of from a shapefile containing one polyline. /// - /// The filepath to the shape file. - /// The reference line created from the data in the shape file. + /// The file path to the shapefile. + /// The reference line created from the data in the shapefile. /// When is invalid. /// When either: /// @@ -68,17 +67,17 @@ using (PolylineShapeFileReader lineShapeReader = OpenPolyLineShapeFile(shapeFilePath)) { - var lineMapData = GetReferenceLineMapData(lineShapeReader, shapeFilePath); + MapLineData lineMapData = GetReferenceLineMapData(lineShapeReader, shapeFilePath); return CreateReferenceLine(lineMapData); } } /// - /// Opens the poly line shape file. + /// Opens the polyline shapefile. /// - /// The shape file path. - /// The reader that can be used to read the shape file. - /// When shape file does not have line geometries. + /// The file path to the shapefile. + /// The reader that can be used to read the shapefile. + /// When shapefile does not have line geometries. private static PolylineShapeFileReader OpenPolyLineShapeFile(string shapeFilePath) { try @@ -97,8 +96,8 @@ /// Gets the reference line map data. /// /// The line shape reader. - /// The shape file path. - /// + /// The shapefile path. + /// The map data representing the reference line. /// /// When either: /// Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/ReferenceLineTest.cs =================================================================== diff -u -rdd7a5cfb0343fa2350b4143232b94cbba37612e9 -ra3c8c0cb4384de51a18d77cc7bea487f97ba21e1 --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/ReferenceLineTest.cs (.../ReferenceLineTest.cs) (revision dd7a5cfb0343fa2350b4143232b94cbba37612e9) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/ReferenceLineTest.cs (.../ReferenceLineTest.cs) (revision a3c8c0cb4384de51a18d77cc7bea487f97ba21e1) @@ -37,6 +37,7 @@ // Assert CollectionAssert.AreEqual(newPoints, referenceLine.Points); + Assert.AreNotSame(newPoints, referenceLine.Points); } [Test] Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/Properties/AssemblyInfo.cs =================================================================== diff -u -ra96a27081bc12d581a196160abc92854a11ec1c6 -ra3c8c0cb4384de51a18d77cc7bea487f97ba21e1 --- Ringtoets/Common/test/Ringtoets.Common.IO.Test/Properties/AssemblyInfo.cs (.../AssemblyInfo.cs) (revision a96a27081bc12d581a196160abc92854a11ec1c6) +++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/Properties/AssemblyInfo.cs (.../AssemblyInfo.cs) (revision a3c8c0cb4384de51a18d77cc7bea487f97ba21e1) @@ -1,5 +1,4 @@ using System.Reflection; -using System.Runtime.CompilerServices; using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following @@ -8,9 +7,9 @@ [assembly: AssemblyTitle("Ringtoets.Common.IO.Test")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Microsoft")] +[assembly: AssemblyCompany("Deltares")] [assembly: AssemblyProduct("Ringtoets.Common.IO.Test")] -[assembly: AssemblyCopyright("Copyright © Microsoft 2016")] +[assembly: AssemblyCopyright("Copyright © Deltares 2016")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/Ringtoets.Common.IO.Test.csproj =================================================================== diff -u -reb0fa1ad33501642b7cd6c7639155f9f83fd50b4 -ra3c8c0cb4384de51a18d77cc7bea487f97ba21e1 --- Ringtoets/Common/test/Ringtoets.Common.IO.Test/Ringtoets.Common.IO.Test.csproj (.../Ringtoets.Common.IO.Test.csproj) (revision eb0fa1ad33501642b7cd6c7639155f9f83fd50b4) +++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/Ringtoets.Common.IO.Test.csproj (.../Ringtoets.Common.IO.Test.csproj) (revision a3c8c0cb4384de51a18d77cc7bea487f97ba21e1) @@ -39,11 +39,6 @@ - - - - - Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/Builders/SoilLayer2D.cs =================================================================== diff -u -rdd7a5cfb0343fa2350b4143232b94cbba37612e9 -ra3c8c0cb4384de51a18d77cc7bea487f97ba21e1 --- Ringtoets/Piping/src/Ringtoets.Piping.IO/Builders/SoilLayer2D.cs (.../SoilLayer2D.cs) (revision dd7a5cfb0343fa2350b4143232b94cbba37612e9) +++ Ringtoets/Piping/src/Ringtoets.Piping.IO/Builders/SoilLayer2D.cs (.../SoilLayer2D.cs) (revision a3c8c0cb4384de51a18d77cc7bea487f97ba21e1) @@ -31,8 +31,9 @@ namespace Ringtoets.Piping.IO.Builders { /// - /// This class represents objects which were imported from a DSoilModel database. Instances of this class are transient and are not to be used - /// once the DSoilModel database has been imported. + /// This class represents objects which were imported from a DSoilModel database. + /// Instances of this class are transient and are not to be used once the DSoilModel + /// database has been imported. /// internal class SoilLayer2D { @@ -228,7 +229,7 @@ { var first = orderedHeights[i]; var second = orderedHeights[i + 1]; - result.Add(new Tuple(first, second)); + result.Add(Tuple.Create(first, second)); } return result; } @@ -237,7 +238,7 @@ /// Gets a of heights where the intersects the /// vertical line at . /// - /// The of which together create a loop. + /// The sequence of which together create a loop. /// The point on the x-axis where the vertical line is constructed do determine intersections with. /// A of , representing the height at which the /// intersects the vertical line at . Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/SoilProfile/SoilLayer2DReader.cs =================================================================== diff -u -rdd7a5cfb0343fa2350b4143232b94cbba37612e9 -ra3c8c0cb4384de51a18d77cc7bea487f97ba21e1 --- Ringtoets/Piping/src/Ringtoets.Piping.IO/SoilProfile/SoilLayer2DReader.cs (.../SoilLayer2DReader.cs) (revision dd7a5cfb0343fa2350b4143232b94cbba37612e9) +++ Ringtoets/Piping/src/Ringtoets.Piping.IO/SoilProfile/SoilLayer2DReader.cs (.../SoilLayer2DReader.cs) (revision a3c8c0cb4384de51a18d77cc7bea487f97ba21e1) @@ -205,7 +205,7 @@ } /// - /// Parses the XML element to create a . + /// Parses the XML element to create a . /// /// The 2D point element. /// When any of the following occurs: