changeset 10:f60bb19f7880 draft default tip

"planemo upload for repository https://forgemia.inra.fr/carboseq/record-projet-carboseq/-/tree/37cec685ade2bbd92376a2a1716ace3b9beab6f9 commit 37cec685ade2bbd92376a2a1716ace3b9beab6f9-dirty"
author siwaa
date Mon, 21 Nov 2022 16:00:30 +0000
parents b75e5e1a0646
children
files findidpairs.xml getdata.xml preparesim.xml runrothc.xml runsim.xml test-data/inputs/client.files/crop.csv test-data/inputs/client.files/meteo.csv test-data/inputs/client.files/soil.csv
diffstat 8 files changed, 68 insertions(+), 214 deletions(-) [+]
line wrap: on
line diff
--- a/findidpairs.xml	Mon Sep 26 16:04:20 2022 +0000
+++ b/findidpairs.xml	Mon Nov 21 16:00:30 2022 +0000
@@ -1,7 +1,7 @@
-<tool id="CarboSeqFindIdPairs" name="CarboSeqFindIdPairs" version="1.1.0">
+<tool id="CarboSeqFindIdPairs" name="CarboSeqFindIdPairs" version="1.2.0">
   <description>To get IdPairs</description>
   <requirements>
-    <container type="singularity">docker://registry.forgemia.inra.fr/csopra/csopralibs:1.1.0</container>
+    <container type="singularity">docker://registry.forgemia.inra.fr/csopra/csopralibs:1.2.0</container>
   </requirements>
   <command detect_errors="exit_code"><![CDATA[
   bash -e -c "mkdir inputs &&
--- a/getdata.xml	Mon Sep 26 16:04:20 2022 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-<tool id="CarboSeqGetData" name="CarboSeqGetData" version="1.0.0">
-  <description>To retrieve the data from the soil db</description>
-  <requirements>
-    <container type="singularity">docker://registry.forgemia.inra.fr/carboseq/record-projet-carboseq/getdatacsopraaial:image-1.0</container>
-  </requirements>
-  <command detect_errors="exit_code"><![CDATA[
-    bash -e -c "R -e \"source('/work/csopralibs/scripts/R/getDataCsopraAIAL.r', echo=TRUE)\" 2>&1; cp ./*.RData ${simulation_data}"
-    ]]>
-  </command>
-<outputs>
-  <data format='rdata' name="simulation_data" label="CarboSeq simulations data"/>
-</outputs>
-<tests>
-  <test>
-    <output name="simulation_data">
-    <assert_contents>
-      <has_size value="216929" delta="100" />
-    </assert_contents>
-    </output>
-  </test>
-</tests>
-<help>
-the CarboSeqGetData tool
-========================
-
-credits
--------
-
--  Wrapper Maintainer: Patrick Chabrier patrick.chabrier@inrae.fr
--  Tool Maintainer: Eric Casellas eric.casellas@inrae.fr
--  Tool Site: https://forgemia.inra.fr/carboseq/record-projet-carboseq
--  Copyright: INRAE
-</help>
-</tool>
--- a/preparesim.xml	Mon Sep 26 16:04:20 2022 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +0,0 @@
-<tool id="CarboSeqPrepareSim" name="CarboSeqPrepareSim" version="1.0.0">
-  <description>To prepare the data for simulating</description>
-  <requirements>
-    <container type="singularity">docker://registry.forgemia.inra.fr/csopra/csopralibs:1.0.0</container>
-  </requirements>
-  <command detect_errors="aggressive"><![CDATA[
-  bash -e -c "mkdir -p data/client.files &&
-  cp ${meteo_data} data/client.files/meteo.csv &&
-  cp ${crop_data} data/client.files/crop.csv &&
-  cp ${soil_data} data/client.files/soil.csv &&
-  mkdir -p data/mapping.files &&
-  cp ${crop_mapping} data/mapping.files/crop.mapping.csv &&
-  cp ${property_mapping} data/mapping.files/property.mapping.csv &&
-  mkdir output &&
-  export CSOPRALIBS_PARAM_OUTPUT=\$(realpath -s output) &&
-  cp /usr/local/src/myscripts/usercases/prepare-sim/run.r . &&
-  Rscript run.r &&
-  cp output/RothcPreparedRunnerResults.RData ${prepare_output}"
-    ]]>
-  </command>
-  <inputs>
-    <param name="meteo_data" type="data" format="csv" label="meteo data (csv file)"/>
-    <param name="crop_data" type="data" format="csv" label="crop data (csv file)"/>
-    <param name="soil_data" type="data" format="csv" label="soil data (csv file)"/>
-    <param name="crop_mapping" type="data" format="csv" label="crop mapping (csv file)"/>
-    <param name="property_mapping" type="data" format="csv" label="property mapping (csv file)"/>
-  </inputs>
-<outputs>
-  <data format='rdata' name="prepare_output" label="Rothc Prepared Runner Results"/>
-</outputs>
-<tests>
-  <test>
-    <param name="meteo_data" value="inputs/client.files/meteo.csv" ftype="csv" />
-    <param name="crop_data" value="inputs/client.files/crop.csv" ftype="csv" />
-    <param name="soil_data" value="inputs/client.files/soil.csv" ftype="csv" />
-    <param name="crop_mapping" value="inputs/mapping.files/crop.mapping.csv" ftype="csv" />
-    <param name="property_mapping" value="inputs/mapping.files/property.mapping.csv" ftype="csv"/>
-    <output name="prepare_output">
-    <assert_contents>
-      <has_size value="5474" />
-    </assert_contents>
-    </output>
-  </test>
-</tests>
-<help>
-the CarboSeqPrepareSim tool
-===========================
-
-credits
--------
-
--  Wrapper Maintainer: Patrick Chabrier patrick.chabrier@inrae.fr
--  Tool Maintainer: Eric Casellas eric.casellas@inrae.fr
--  Tool Site: https://forgemia.inra.fr/carboseq/record-projet-carboseq
--  Copyright: INRAE
-</help>
-</tool>
--- a/runrothc.xml	Mon Sep 26 16:04:20 2022 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-<tool id="CarboSeqRunRothC" name="CarboSeqRunRothC" version="1.0.0">
-  <description>To run the RothC simulator</description>
-  <requirements>
-    <container type="singularity">docker://registry.forgemia.inra.fr/carboseq/record-projet-carboseq/testcaserothc:image-rothc-1.0</container>
-  </requirements>
-  <command detect_errors="exit_code"><![CDATA[
-  bash -e -c "cp -r /work/csopralibs . &&
-  cp ${simulation_data} CsopraAIALInTestCase.RData &&
-  cp ${climat_data} csopralibs/data/Csopra/Climat_Csopra/CSOPRA_CLIMAT_MOIS_SAFRAN_2416.txt &&
-  cp /work/csopralibs/scripts/R/testCaseRothC.r testCaseRothC.r &&
-  sed -i 's/source(\"~\/\.Rpro/homeS <- \".\" #source(\"~\/\.Rpro/' testCaseRothC.r &&
-  sed -i 's/setwd(homeS/setwd(getwd()/' testCaseRothC.r  &&
-  sed -i 's/load(\"~\/tmp/load(\"\./' testCaseRothC.r &&
-  R -e \"source('./testCaseRothC.r', echo=TRUE)\" > ${log} &&
-  cp Rplots.pdf ${plot}"
-    ]]>
-  </command>
-  <inputs>
-    <param name="simulation_data" type="data" format="rdata" label="CarboSeq simulations data (rdata file)"/>
-    <param name="climat_data" type="data" format="txt" label="CarboSeq climat data (txt file)"/>
-  </inputs>
-<outputs>
-  <data format='txt' name="log" label="CarboSeq RothC log"/>
-  <data format='pdf' name="plot" label="CarboSeq plot"/>
-</outputs>
-<tests>
-  <test>
-    <param name="simulation_data" value="inputs/Galaxy1-CarboSeq_simulations_data.rdata" ftype="rdata" />
-    <param name="climat_data" value="inputs/CSOPRA_CLIMAT_MOIS_SAFRAN_2416.txt" ftype="txt" />
-    <output name="plot">
-    <assert_contents>
-      <has_size value="27045" delta="100" />
-    </assert_contents>
-    </output>
-    <output name="log">
-      <assert_contents>
-      <has_line line="> simTrial$runner$run()" />
-    </assert_contents>
-    </output>
-  </test>
-
-</tests>
-<help>
-the CarboSeqGetData tool
-========================
-
-credits
--------
-
--  Wrapper Maintainer: Patrick Chabrier patrick.chabrier@inrae.fr
--  Tool Maintainer: Eric Casellas eric.casellas@inrae.fr
--  Tool Site: https://forgemia.inra.fr/carboseq/record-projet-carboseq
--  Copyright: INRAE
-</help>
-</tool>
--- a/runsim.xml	Mon Sep 26 16:04:20 2022 +0000
+++ b/runsim.xml	Mon Nov 21 16:00:30 2022 +0000
@@ -1,7 +1,7 @@
-<tool id="CarboSeqRunSim" name="CarboSeqRunSim" version="1.1.0">
+<tool id="CarboSeqRunSim" name="CarboSeqRunSim" version="1.2.0">
   <description>To run the simulator</description>
   <requirements>
-    <container type="singularity">docker://registry.forgemia.inra.fr/csopra/csopralibs:1.1.0</container>
+    <container type="singularity">docker://registry.forgemia.inra.fr/csopra/csopralibs:1.2.0</container>
   </requirements>
   <command detect_errors="exit_code"><![CDATA[
   bash -e -c "mkdir inputs &&
@@ -41,7 +41,7 @@
     <param name="soil_data" value="inputs/client.files/soil.csv" ftype="csv" />
     <output name="run_output">
     <assert_contents>
-      <has_size value="5462" delta="100" />
+      <has_size value="4741" delta="100" />
     </assert_contents>
     </output>
   </test>
--- a/test-data/inputs/client.files/crop.csv	Mon Sep 26 16:04:20 2022 +0000
+++ b/test-data/inputs/client.files/crop.csv	Mon Nov 21 16:00:30 2022 +0000
@@ -1,41 +1,41 @@
-ID;NUM;CROP;Till;EOM;CI_CC;Irrig;Yield
-1;1;2.1.1.2;0;1,13;1,40;50;0,3300
-1;2;2.1.1.2;1;2,51;1,74;60;0,1490
-1;3;2.1.1.1;1;3,42;1,27;60;0,2200
-1;4;2.1.1.1;1;2,34;0,00;100;0,2500
-2;1;2.1.1.2;1;0,67;1,23;0;0,1650
-2;2;2.1.1.2;1;3,70;0,00;0;0,1300
-2;3;2.1.1.1;0;2,93;0,00;0;0,2400
-2;4;2.1.1.1;0;2,09;0,00;0;0,2000
-3;1;2.1.2.1;1;0,29;0,00;150;0,7500
-3;2;2.1.2.1;1;4,33;1,26;200;0,7000
-3;3;2.1.2.1;0;2,71;0,00;250;0,7300
-3;4;2.1.2.1;0;0,93;0,00;450;0,7100
-4;1;2.2.1.1;0;0,22;0,00;0;0,1300
-4;2;2.2.1.1;0;0,83;0,00;0;0,1300
-4;3;2.2.1.1;0;2,41;0,00;0;0,0800
-4;4;2.2.1.1;0;2,97;0,00;0;0,1100
-5;1;2.1.1.2;1;1,89;0,00;0;0,1870
-5;2;2.1.1.3;1;3,12;1,21;0;2,5000
-5;3;2.1.1.3;0;2,14;0,00;0;2,3000
-5;4;2.1.1.3;1;3,13;1,74;0;2,1000
-6;1;2.2.1.1;0;2,00;0,00;250;0,1000
-6;2;2.2.1.1;0;3,32;0,00;500;0,0900
-6;3;2.2.1.1;0;1,09;0,00;400;0,1200
-6;4;2.2.1.1;0;2,66;0,00;300;0,1300
-7;1;2.3.1.1;0;3,18;0,00;100;0,1800
-7;2;2.3.1.1;0;3,38;0,00;350;0,1600
-7;3;2.3.1.1;1;1,45;1,38;300;0,1800
-7;4;2.3.1.1;1;2,74;0,77;200;0,1500
-8;1;2.2.3.1;0;2,18;0,00;300;0,1000
-8;2;2.2.3.1;0;4,60;0,00;300;0,1000
-8;3;2.2.3.1;0;1,44;0,00;250;0,0800
-8;4;2.2.3.1;0;2,53;0,00;300;0,1000
-9;1;2.1.1.2;1;3,05;1,05;0;0,2750
-9;2;2.1.1.4;0;3,15;0,00;0;30,0000
-9;3;2.1.1.4;1;1,71;1,89;0;28,0000
-9;4;2.1.1.1;1;1,31;1,47;0;0,2100
-10;1;2.2.3.1;0;2,97;0,00;0;0,0900
-10;2;2.2.3.1;0;2,68;0,00;0;0,1000
-10;3;2.2.3.1;0;0,62;0,00;0;0,0800
-10;4;2.2.3.1;0;3,84;0,00;0;0,0800
+"ID","NUM","CROP","Till","EOM","CI_CC","Irrig","Yield"
+1,1,"2.1.1.2",0,1.13,1.4,50,0.33
+1,2,"2.1.1.2",1,2.51,1.74,60,0.149
+1,3,"2.1.1.1",1,3.42,1.27,60,0.22
+1,4,"2.1.1.1",1,2.34,0,100,0.25
+2,1,"2.1.1.2",1,0.67,1.23,0,0.165
+2,2,"2.1.1.2",1,3.7,0,0,0.13
+2,3,"2.1.1.1",0,2.93,0,0,0.24
+2,4,"2.1.1.1",0,2.09,0,0,0.2
+3,1,"2.1.2.1",1,0.29,0,150,0.75
+3,2,"2.1.2.1",1,4.33,1.26,200,0.7
+3,3,"2.1.2.1",0,2.71,0,250,0.73
+3,4,"2.1.2.1",0,0.93,0,450,0.71
+4,1,"2.2.1.1",0,0.22,0,0,0.13
+4,2,"2.2.1.1",0,0.83,0,0,0.13
+4,3,"2.2.1.1",0,2.41,0,0,0.08
+4,4,"2.2.1.1",0,2.97,0,0,0.11
+5,1,"2.1.1.2",1,1.89,0,0,0.187
+5,2,"2.1.1.3",1,3.12,1.21,0,2.5
+5,3,"2.1.1.3",0,2.14,0,0,2.3
+5,4,"2.1.1.3",1,3.13,1.74,0,2.1
+6,1,"2.2.1.1",0,2,0,250,0.1
+6,2,"2.2.1.1",0,3.32,0,500,0.09
+6,3,"2.2.1.1",0,1.09,0,400,0.12
+6,4,"2.2.1.1",0,2.66,0,300,0.13
+7,1,"2.3.1.1",0,3.18,0,100,0.18
+7,2,"2.3.1.1",0,3.38,0,350,0.16
+7,3,"2.3.1.1",1,1.45,1.38,300,0.18
+7,4,"2.3.1.1",1,2.74,0.77,200,0.15
+8,1,"2.2.3.1",0,2.18,0,300,0.1
+8,2,"2.2.3.1",0,4.6,0,300,0.1
+8,3,"2.2.3.1",0,1.44,0,250,0.08
+8,4,"2.2.3.1",0,2.53,0,300,0.1
+9,1,"2.1.1.2",1,3.05,1.05,0,0.275
+9,2,"2.1.1.4",0,3.15,0,0,30
+9,3,"2.1.1.4",1,1.71,1.89,0,28
+9,4,"2.1.1.1",1,1.31,1.47,0,0.21
+10,1,"2.2.3.1",0,2.97,0,0,0.09
+10,2,"2.2.3.1",0,2.68,0,0,0.1
+10,3,"2.2.3.1",0,0.62,0,0,0.08
+10,4,"2.2.3.1",0,3.84,0,0,0.08
--- a/test-data/inputs/client.files/meteo.csv	Mon Sep 26 16:04:20 2022 +0000
+++ b/test-data/inputs/client.files/meteo.csv	Mon Nov 21 16:00:30 2022 +0000
@@ -1,11 +1,11 @@
-ID;AVT_JAN;AVT_FEB;AVT_MAR;AVT_APR;AVT_MAY;AVT_JUN;AVT_JUL;AVT_AUG;AVT_SEP;AVT_OCT;AVT_NOV;AVT_DEC;PREC_JAN;PREC_FEB;PREC_MAR;PREC_APR;PREC_MAY;PREC_JUN;PREC_JUL;PREC_AUG;PREC_SEP;PREC_OCT;PREC_NOV;PREC_DEC;ET0_JAN;ET0_FEB;ET0_MAR;ET0_APR;ET0_MAY;ET0_JUN;ET0_JUL;ET0_AUG;ET0_SEP;ET0_OCT;ET0_NOV;ET0_DEC
-1;5,7;6,35;9;11,7;16,08;20,17;22,92;23,35;19,26;15,27;10,46;6,66;55,01;55,76;59,13;62,51;54,78;43,86;27,27;27,99;81,51;95,13;107,33;80,47;27,55;38,17;65,26;85,68;124,47;150,31;174,47;155,55;99,83;61,19;34,17;26,19
-2;6,65;7,15;9,92;12,85;17,22;21,34;24,02;24,17;20,18;16,13;11,51;7,71;59,56;47,24;51,31;60,2;44,15;48,48;40,57;43,82;70,53;74,12;88,41;76,02;29,15;38,57;64,48;84,81;122,18;147,7;168,23;146,79;95,32;58,78;35,44;28,61
-3;6,11;6,59;9,31;12,14;16,53;20,69;23,44;23,67;19,51;15,49;10,83;7,1;59,13;51,08;54,13;60,24;46,72;45,87;36,61;37,04;71,27;77,07;91,22;76,18;28,69;38,33;64,71;85,22;122,17;147,73;169,25;149,16;96,47;59,46;35,27;27,53
-4;6,26;6,57;9,19;12,11;16,52;20,77;23,56;23,63;19,4;15,41;10,97;7,3;68,98;48,99;52,82;58,84;45,96;51,64;44,42;46,67;70,46;69,5;83,25;72,15;30,08;38,88;63,78;85;120,61;145,67;164,36;144,4;93,99;59,01;36,84;29,1
-5;4,66;5;7,85;10,87;15,45;19,71;22,41;22,56;18,06;14,04;9,41;5,61;59,38;46,86;49,95;55,2;42,18;45,74;35,03;40,31;61,07;64,23;79,58;66,46;27,43;36,31;62,43;84,54;120,8;146,87;167,71;147,07;92,77;57,31;34,28;25,93
-6;4,77;5,16;7,98;10,94;15,5;19,74;22,46;22,7;18,2;14,2;9,5;5,7;59,34;50,09;52,69;56,82;42,91;42,23;33,23;35,04;60,9;67,53;83,82;69,26;27,05;36,4;62,97;84,9;121,1;147,12;168,5;148,42;93,9;57,9;34,12;25,5
-7;6,71;7,01;9,56;12,49;16,86;21,1;23,87;23,9;19,79;15,81;11,43;7,78;68,44;47,62;51,6;57,94;45,07;51,76;44,27;46,51;71,23;69,44;83,49;71,84;31,02;39,79;64,45;85,66;121,25;146,24;164,3;144,43;94,99;59,83;37,73;30,1
-8;3,65;3,95;6,87;9,9;14,55;18,88;21,6;21,78;17,05;13,04;8,36;4,55;59,72;47,63;51,36;55,49;43,65;48,91;36,99;41,92;60,45;62,02;74,63;64,15;26,51;35,32;61,38;83,95;119,82;146,6;168,06;147,88;91,81;56,91;33,73;25,11
-9;6,07;6,79;9,36;12,02;16,4;20,44;23,28;23,67;19,57;15,55;10,78;6,99;51,34;56,71;57,26;62,37;55,92;45,23;25,86;30,05;80,03;96,65;104,5;77,21;27,7;38,57;65,44;85,96;125,4;151,43;176,87;157,45;100,91;61,55;34,19;26,57
-10;7,07;7,61;10,12;12,75;17,04;21,07;23,83;24,28;20,41;16,51;11,84;8,06;59,51;59,14;59,29;63,82;50,62;37,17;26,09;27,47;76,06;99,02;109,21;83,84;28,86;39,46;65,97;86,72;125,59;151,73;175;156,03;101,18;62,9;35,95;27,67
+"ID","AVT_JAN","AVT_FEB","AVT_MAR","AVT_APR","AVT_MAY","AVT_JUN","AVT_JUL","AVT_AUG","AVT_SEP","AVT_OCT","AVT_NOV","AVT_DEC","PREC_JAN","PREC_FEB","PREC_MAR","PREC_APR","PREC_MAY","PREC_JUN","PREC_JUL","PREC_AUG","PREC_SEP","PREC_OCT","PREC_NOV","PREC_DEC","ET0_JAN","ET0_FEB","ET0_MAR","ET0_APR","ET0_MAY","ET0_JUN","ET0_JUL","ET0_AUG","ET0_SEP","ET0_OCT","ET0_NOV","ET0_DEC"
+1,5.7,6.35,9,11.7,16.08,20.17,22.92,23.35,19.26,15.27,10.46,6.66,55.01,55.76,59.13,62.51,54.78,43.86,27.27,27.99,81.51,95.13,107.33,80.47,27.55,38.17,65.26,85.68,124.47,150.31,174.47,155.55,99.83,61.19,34.17,26.19
+2,6.65,7.15,9.92,12.85,17.22,21.34,24.02,24.17,20.18,16.13,11.51,7.71,59.56,47.24,51.31,60.2,44.15,48.48,40.57,43.82,70.53,74.12,88.41,76.02,29.15,38.57,64.48,84.81,122.18,147.7,168.23,146.79,95.32,58.78,35.44,28.61
+3,6.11,6.59,9.31,12.14,16.53,20.69,23.44,23.67,19.51,15.49,10.83,7.1,59.13,51.08,54.13,60.24,46.72,45.87,36.61,37.04,71.27,77.07,91.22,76.18,28.69,38.33,64.71,85.22,122.17,147.73,169.25,149.16,96.47,59.46,35.27,27.53
+4,6.26,6.57,9.19,12.11,16.52,20.77,23.56,23.63,19.4,15.41,10.97,7.3,68.98,48.99,52.82,58.84,45.96,51.64,44.42,46.67,70.46,69.5,83.25,72.15,30.08,38.88,63.78,85,120.61,145.67,164.36,144.4,93.99,59.01,36.84,29.1
+5,4.66,5,7.85,10.87,15.45,19.71,22.41,22.56,18.06,14.04,9.41,5.61,59.38,46.86,49.95,55.2,42.18,45.74,35.03,40.31,61.07,64.23,79.58,66.46,27.43,36.31,62.43,84.54,120.8,146.87,167.71,147.07,92.77,57.31,34.28,25.93
+6,4.77,5.16,7.98,10.94,15.5,19.74,22.46,22.7,18.2,14.2,9.5,5.7,59.34,50.09,52.69,56.82,42.91,42.23,33.23,35.04,60.9,67.53,83.82,69.26,27.05,36.4,62.97,84.9,121.1,147.12,168.5,148.42,93.9,57.9,34.12,25.5
+7,6.71,7.01,9.56,12.49,16.86,21.1,23.87,23.9,19.79,15.81,11.43,7.78,68.44,47.62,51.6,57.94,45.07,51.76,44.27,46.51,71.23,69.44,83.49,71.84,31.02,39.79,64.45,85.66,121.25,146.24,164.3,144.43,94.99,59.83,37.73,30.1
+8,3.65,3.95,6.87,9.9,14.55,18.88,21.6,21.78,17.05,13.04,8.36,4.55,59.72,47.63,51.36,55.49,43.65,48.91,36.99,41.92,60.45,62.02,74.63,64.15,26.51,35.32,61.38,83.95,119.82,146.6,168.06,147.88,91.81,56.91,33.73,25.11
+9,6.07,6.79,9.36,12.02,16.4,20.44,23.28,23.67,19.57,15.55,10.78,6.99,51.34,56.71,57.26,62.37,55.92,45.23,25.86,30.05,80.03,96.65,104.5,77.21,27.7,38.57,65.44,85.96,125.4,151.43,176.87,157.45,100.91,61.55,34.19,26.57
+10,7.07,7.61,10.12,12.75,17.04,21.07,23.83,24.28,20.41,16.51,11.84,8.06,59.51,59.14,59.29,63.82,50.62,37.17,26.09,27.47,76.06,99.02,109.21,83.84,28.86,39.46,65.97,86.72,125.59,151.73,175,156.03,101.18,62.9,35.95,27.67
--- a/test-data/inputs/client.files/soil.csv	Mon Sep 26 16:04:20 2022 +0000
+++ b/test-data/inputs/client.files/soil.csv	Mon Nov 21 16:00:30 2022 +0000
@@ -1,11 +1,11 @@
-ID;CODEX;YEAR;LON;LAT;CF;CLAY;SILT;BD;OC_GKG;OC_THA;pH;CaCO3;TN;Elev;Slope;EXP
-1;BDSP50;1994;45,726270;21,142760;10,0;19,3;52,2;0,85;7,71;167,7850;6,7;65,1;1,00;135;0,00;143,0
-2;BDSP56;2004;46,178740;21,699670;0,0;21,7;31,9;1,29;1,68;55,0700;7,5;39,0;0,70;160;0,80;105,0
-3;BDSP70;1999;46,198620;21,302570;0,0;29,0;57,7;1,05;6,27;132,6970;7,8;60,3;0,60;27;0,40;33,5
-4;BDSP10070;2001;46,591460;21,221710;0,0;9,4;44,1;0,32;9,87;23,4380;6,9;66,8;0,50;88;2,86;349,0
-5;BDSP10087;2001;46,607780;21,282050;2,0;30,5;22,1;0,30;7,80;46,7910;7,4;67,6;0,60;240;0,85;213,0
-6;BDSP10091;2001;46,578380;21,141870;1,0;7,2;23,0;0,24;8,19;35,3000;8,0;59,5;0,40;32;0,10;158,0
-7;BDSP10098;2001;46,667340;21,236030;0,0;2,7;26,0;0,16;5,29;54,7950;7,3;50,6;1,50;142;0,00;122,0
-8;BDSP10099;2001;46,660860;21,218430;1,0;13,2;80,1;0,53;14,18;184,9960;6,2;56,4;0,60;49;0,85;52,5
-9;LAZ2P5;2014;45,388030;21,456140;0,5;32,7;42,8;0,32;8,84;57,4970;8,1;48,9;1,10;230;0,42;77,0
-10;LAZ2P11;2013;45,583640;20,956450;0,0;31,0;49,7;0,48;7,22;67,9960;7,6;55,8;0,30;44;0,90;358,0
+"ID","CODEX","YEAR","LON","LAT","CF","CLAY","SILT","BD","OC_GKG","OC_THA","pH","CaCO3","TN","Elev","Slope","EXP"
+1,"BDSP50",1994,45.72627,21.14276,10,19.3,52.2,0.85,7.71,167.785,6.7,65.1,1,135,0,143
+2,"BDSP56",2004,46.17874,21.69967,0,21.7,31.9,1.29,1.68,55.07,7.5,39,0.7,160,0.8,105
+3,"BDSP70",1999,46.19862,21.30257,0,29,57.7,1.05,6.27,132.697,7.8,60.3,0.6,27,0.4,33.5
+4,"BDSP10070",2001,46.59146,21.22171,0,9.4,44.1,0.32,9.87,23.438,6.9,66.8,0.5,88,2.86,349
+5,"BDSP10087",2001,46.60778,21.28205,2,30.5,22.1,0.3,7.8,46.791,7.4,67.6,0.6,240,0.85,213
+6,"BDSP10091",2001,46.57838,21.14187,1,7.2,23,0.24,8.19,35.3,8,59.5,0.4,32,0.1,158
+7,"BDSP10098",2001,46.66734,21.23603,0,2.7,26,0.16,5.29,54.795,7.3,50.6,1.5,142,0,122
+8,"BDSP10099",2001,46.66086,21.21843,1,13.2,80.1,0.53,14.18,184.996,6.2,56.4,0.6,49,0.85,52.5
+9,"LAZ2P5",2014,45.38803,21.45614,0.5,32.7,42.8,0.32,8.84,57.497,8.1,48.9,1.1,230,0.42,77
+10,"LAZ2P11",2013,45.58364,20.95645,0,31,49.7,0.48,7.22,67.996,7.6,55.8,0.3,44,0.9,358