[ci skip] Merge branch 'main' into release

README.md

 # LygusRugulipennisModel
 
-This repository contains the implementation of the European tarnished plant bug model.
+<p><img src="src/main/resources/images/lygusr.jpg" title="Foto: E. Fl&amp;oslash;istad"/></p>
+<h3>Model description</h3>
+<p>The pest prediction&nbsp;model LYGUSRUGUL (&ldquo;European tarnished plant bug &ndash; flight activity in vegetables&rdquo;) is based on several years' studies of the relation between maximum temperatures and bug activity in carrot fields (Tor J. Johansen, unpublished). It was implemented in VIPS in 2008. The forecast indicates the risk of flight activity and damage in the fields. The need for control measures is further based on the plant development stage, and expected bug population size at each locality. Local temperature observations should be used when the weather station is distant.</p>
+<p>The model is activated on April 1st, and input is daily maximum temperature (TXD) for risk calculation. Both historic data and temperature prognoses (for up to two days) are used.</p>
+<h3>Interpretation of warning status</h3>
+<p>Green boxes: No risk for flight activity into the field. This color is presented in the period before flight activity is expected (max temperature &lt; 15 &deg;C), and if temperature drops below 10 &deg;C after a warning of flight risk (yellow or red boxes).</p>
+<p>Yellow boxes: Possible risk for flight activity and damage to plants. The bugs are ready for flight into the field, or are inactive in the field due to low temperatures. This color is presented for the first time after three days with daily maximum temperature of at least 15 &deg;C (not necessarily continuously). After this, on days with maximum temperatures between 10 and 15 &deg;C.</p>
+<p>Red boxes: Great risk for flight activity and damage to plants in the field. This color is presented for the first time after four days with daily maximum temperature of at least 15 &deg;C (not necessarily continuously). This forecast continuous as long as temperatures remain on this level, and changes to yellow on the first day with temperatures below 15 &deg;C. After this, it changes to red color every day with maximum temperature of at least 15 &deg;C. Red boxes now indicate that temperatures for flight into the fields are sufficient, and that there is a great risk for flight activity and damage to the plants. Actual damage requires&nbsp;an established plant stand (after seed-leaf stage).</p>
+<p>Grey boxes: Low risk of damage to the plants at the actual station, and closed forecasting service.</p>
+<h3>Validation of the model</h3>
+<p>After implementation of the model in VIPS (2008) it has been validated over several years (2008-2013) by comparing actual bug activity (pheromone and/or collision traps) with forecasting based on in-field temperature registrations. The bug activity corresponded well with the risk forecast. Longer distance to the weather station will lead to less accurate warning.</p>
 
 ### Development
 

pom.xml

@@ -10,14 +10,14 @@
 
     <groupId>no.nibio.vips.model</groupId>
     <artifactId>LygusRugulipennisModel</artifactId>
-    <version>1.1.2</version>
+    <version>1.1.3-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <dependencies>
         <dependency>
             <groupId>no.nibio.vips</groupId>
             <artifactId>VIPSCommon</artifactId>
-            <version>2.0.1</version>
+            <version>2.0.2</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>

src/main/java/no/nibio/vips/model/lygusrugulipennismodel/LygusRugulipennisModel.java

@@ -136,7 +136,23 @@ public class LygusRugulipennisModel extends I18nImpl implements Model{
 
     @Override
     public String getLicense() {
-        return "GNU AFFERO GENERAL PUBLIC LICENSE Version 3";
+        return 
+                "  Copyright (c) 2016 NIBIO <http://www.nibio.no/>. \n" +
+                "  \n" +
+                "  This file is part of LygusRugulipennisModel.\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