[ci skip] Merge branch 'main' into release

README.md

@@ -2,6 +2,23 @@
 
 This repository contains the implementation of the Oat flowering model.
 
+**(Norwegian only)**
+<h2>Blomstringsmodell i havre</h2>
+<div><strong>Kontaktperson: <a href="https://nibio.no/ansatte/ingerd-skow-hofgaard">Ingerd Skow Hofgaard</a></strong></div>
+<div>&nbsp;</div>
+<div>Enkelte &aring;r har det v&aelig;rt h&oslash;y forekomst av deoxynivalenol (DON) i norskprodusert korn, og spesielt havre. Dette mykotoksinet (soppgift) produseres av <a href="https://www.plantevernleksikonet.no/l/oppslag/1239/">Fusarium graminearum og Fusarium culmorum</a> - sopper som for&aring;rsaker kornsjukdommen "aksfusariose". Risikoen for aksfusariose og utvikling av DON i korn &oslash;ker s&aelig;rlig ved fuktig v&aelig;r i kornplantenes blomstringsperiode (se tabellen nedenfor, Hofgaard mfl.2020 og Hjelkrem mfl. 2021).</div>
+<div>&nbsp;</div>
+<div>Fungicid-behandling under blomstring av kornet (og med et preparat som inneholder protiokonazol) har vist seg i gjennomsnitt &aring; halvere forekomsten av DON i h&oslash;sta korn.</div>
+<div>&nbsp;</div>
+<div><a href="/fusarium/">Blomstringsmodellen i havre</a> kan, basert p&aring; s&aring;dato og v&aelig;rdata fra n&aelig;rmeste m&aring;lestasjon, beregne dato for blomstring av havre slik at tidspunkt for en eventuell behandling med fungicid kan planlegges.</div>
+<div>&nbsp;</div>
+<div><em>Risiko for utvikling av deoksynivalenol (DON) i korn:</em></div>
+<div><img src="src/main/resources/images/RisikoForDon650.gif" title="Aksfusariose- beregning av blomstring i havre"/></div>
+<div><em>Tabellen viser antatt risiko for utvikling av deoxynivalenol (DON) i korn. Dersom det er stor risiko for utvikling av Fusarium og mykotoksiner, anbefales det &aring; spr&oslash;yte med et soppmiddel som inneholder protiokonazol under blomstringa. Dersom man dyrker en spesielt mottakelig sort, anbefales det &aring; spr&oslash;yte ogs&aring; dersom det er moderat <br />risiko for utvikling av DON. OBS! Mais som forgr&oslash;de gir betydelig &oslash;kt risiko. Tabellen er hentet fra NIBIO-pop 6(40) 2020.</em></div>
+<div>&nbsp;</div>
+<h3>Referanser</h3>
+<div>Hofgaard, I.S., Aamot, H.U., Brodal, G., Russenes, A.L, Hjelkrem, A.R., Lillemo, M. og Strand, E. 2020. Hvordan redusere risiko for mykotoksiner i korn? NIBIO-pop 6(40) 2020. <a href="https://hdl.handle.net/11250/2711593">https://hdl.handle.net/11250/2711593</a> <br />Hofgaard, I. S., Hjelkrem, A.G.R., Strand, E. 2020. Hvordan produsere havre med lavt innhold av mykotoksiner? Avslutningsseminar for Trygghavre/SafeOats-prosjektet, Vitenparken, &Aring;s, 18. november 2020. <a href="https://youtu.be/XdCJodd87Rw">https://youtu.be/XdCJodd87Rw</a> <br />Hjelkrem et al 2021. Weather Patterns Associated with DON Levels in Norwegian Spring Oat Grain: A Functional Data Approach. <a href="https://doi.org/10.3390/plants11010073">Plants 2022, 11(1), 73;</a></div>
+
 ### Development
 
 Clone Gitlab repository

pom.xml

@@ -11,7 +11,7 @@
 
     <groupId>no.nibio.vips.model</groupId>
     <artifactId>OatFloweringModel</artifactId>
-    <version>1.1.2</version>
+    <version>1.1.3-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <dependencies>
@@ -29,7 +29,7 @@
         <dependency>
             <groupId>no.nibio.vips</groupId>
             <artifactId>VIPSCommon</artifactId>
-            <version>2.0.1</version>
+            <version>2.0.2</version>
         </dependency>
     </dependencies>
     <properties>

src/main/java/no/nibio/vips/model/oatfloweringmodel/OatFloweringModel.java

@@ -2,18 +2,18 @@
  * Copyright (c) 2014 NIBIO <http://www.nibio.no/>. 
  * 
  * This file is part of OatFloweringModel.
- * OatFloweringModel is free software: you can redistribute it and/or modify
- * it under the terms of the NIBIO Open Source License as published by 
- * NIBIO, either version 1 of the License, or (at your option) any
- * later version.
- * 
- * OatFloweringModel is distributed in the hope that it will be useful,
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * NIBIO Open Source License for more details.
- * 
- * You should have received a copy of the NIBIO Open Source License
- * along with OatFloweringModel.  If not, see <http://www.nibio.no/licenses/>.
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  * 
  */
 
@@ -152,21 +152,23 @@ public class OatFloweringModel extends I18nImpl implements Model{
 
     @Override
     public String getLicense() {
-        return "Copyright (c) 2014 NIBIO <http://www.nibio.no/>. \n" +
-            "\n" +
-            "This file is part of OatFloweringModel. \n" + 
-            "OatFloweringModel is free software: you can redistribute it and/or modify \n" + 
-            "it under the terms of the NIBIO Open Source License as published by \n" + 
-            "NIBIO, either version 1 of the License, or (at your option) any \n" +
-            "later version. \n" +
-            "\n" +
-            "OatFloweringModel is distributed in the hope that it will be useful, \n" +
-            "but WITHOUT ANY WARRANTY; without even the implied warranty of \n" +
-            "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the \n" +
-            "NIBIO Open Source License for more details. \n" +
-            "\n" +
-            "You should have received a copy of the NIBIO Open Source License \n" +
-            "along with OatFloweringModel.  If not, see <http://www.nibio.no/licenses/>. \n";
+        return 
+                "  Copyright (c) 2014 NIBIO <http://www.nibio.no/>. \n" +
+                "  \n" +
+                "  This file is part of OatFloweringModel.\n" +
+                "  This program is free software: you can redistribute it and/or modify\n" +
+                "  it under the terms of the GNU Affero General Public License as published by\n" +
+                "  the Free Software Foundation, either version 3 of the License, or\n" +
+                "  (at your option) any later version.\n" +
+                " \n" +
+                "  This program is distributed in the hope that it will be useful,\n" +
+                "  but WITHOUT ANY WARRANTY; without even the implied warranty of\n" +
+                "  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n" +
+                "  GNU Affero General Public License for more details.\n" +
+                " \n" +
+                "  You should have received a copy of the GNU Affero General Public License\n" +
+                "  along with this program.  If not, see <https://www.gnu.org/licenses/>.\n" +
+                "  \n" ;
     }
 
     @Override