diff --git a/README.md b/README.md
index 4eeea4f1b6e6b1b8b840a9d488e8e737bbbe9f67..6188e16eff0cc4084a64f24377867de9a5bdc095 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,33 @@
# PsilaRosaeTempModel
-This repository contains the implementation of the Carrot rust fly (Psila rosae) temperature model.
-
-Documentation is available [here](https://www.vips-landbruk.no/forecasts/models/PSILARTEMP/).
+<p><img src="src/main/resources/images/plh-2007-0232.jpg" title="Photo: Lars-Arne Høgetveit, NLR Viken"/></p>
+<h3>Description of the model</h3>
+<p>The warning system model «Carrot rust fly temperature» is based on a Finnish temperature-based model (Markkula <em>et al</em>, 1998; Tiilikkala & Ojanen, 1999; Markkula <em>et al</em>, 2000). The model determines the start of the flight period for the 1st and 2nd generation of carrot rust fly based on accumuleted degree-days (day-degrees) over a base temperature of 5,0 °C. VIPS uses the model for the 1st generation only.</p>
+<p>Standard air temperature (temperature measured 2 m above ground) is used in the model. Degree-days are defined for this model as the sum of the difference between a base temperature of 5,0 °C and the mean temperature for all days with a temperature >5,0 °C, in other words (daily mean temperature – 5,0 °C) from 1 March (beginning when the ground has thawed).</p>
+<h3>Interpretation of the warning</h3>
+<p>Green rectangles indicate that the flight period has not yet begun. The accumulated day-degrees are < 260 degree-days (day-degrees).</p>
+<p>Yellow rectangles indicate that the flight period is beginning and that flies can be coming into the field. The accumulated day-degrees are ≥ 260 degree-days (day-degrees).</p>
+<p>Red rectangles indicate peak flight period. The accumulated day-degrees are ≥ 360 degree-days (day-degrees).</p>
+<p>Grey rectangles indicate that the flight period of the 1st generation is over. The accumulated day-degrees are ≥ 560 degree-days (day-degrees).</p>
+<p>Be aware that in areas with field covers (plastic, single or double non-woven covers, etc.) with early crops the preceding season (either on the current field or neighboring fields), the flight period can start earlier due to higher soil temperature under the covers.</p>
+<p>The graphic presentation shows the progress of the day-degree calculation that is the basis for the green, yellow and red warnings (the line: «Accumulated day-degrees with the base temperature of 5 degrees C»). The graph show straight horizontal lines for the threshold values. «Day-degree threshold for low likelihood of attack» corresponds to when the warning changes from green to yellow (260 day-degrees). «Day-degree threshold for high likelihood of attack » corresponds to when the warning changes from yellow to red (360 day-degrees). «Day-degree threshold for end of flight period» corresponds to when the warning changes from red to grey (560 day-degrees) and the flight period for the 1st generation is considered to be over. When the line « Accumulated day-degrees with the base temperature of 5 degrees C» intersects one of the lines for the day-degree threshold, the warning will advance to the next level and the color of the warning rectangle will change. The graph also shows the daily mean temperature for the relevant weather station. The graph is dynamic and the user can choose which parameters that are shown by clicking on the explanation below the graph.</p>
+<h3>Warning season – start and end of the warning</h3>
+<p>Starting time: Shown in VIPS from 1 April (starting date for accumulation of degree-days beginning from when the ground has thawed).<br /> Ending time: When the model has reached the requirement for the end of the flight period for the 1st generation (560 day-degrees).</p>
+<h3>Testing and validation of the model</h3>
+<h4>National</h4>
+<p>The model has been tested for Norwegian conditions in the period of 2011-2015. Validation has shown that the model was accurate for most locations for the 1st generation. The model was, however, inaccurate for the 2nd generation for many locations and was totally incorrect for the district of Jæren. Based on the validation results, we have therefore chosen to remove warning of the 2nd generation of carrot rust fly from this model.</p>
+<h4>International</h4>
+<p>The model is in use in Finland. The extent to which the model has been validated in Finland is uncertain, but a validation was done in the summer of 1997. This validation showed that the model was quite accurate, but that the threshold temperature sm should be lowered to 255 day-degrees for the start of the flight period (as opposed to 260 degree-days in the original model) and 355 degree-days forthe peak flight period (as opposed to 360 degree-days in the original model) (Tiilikkala & Ojanen, 1999).</p>
+<h3>Literature</h3>
+<p>Markkula, I., H. Ojanen and K. Tiilikkala. 1998. Forecasting and monitoring of the carrot fly (<em>Psila rosae</em>) in Finland. The 1998 Brighton Conference: Pests and Diseases: Conference Proceedings, Volume 2, pages 657-662.</p>
+<p>Tiilikkala, K. and H. Ojanen. 1999. Use of a geographical information system (GIS) for forecasting the activities of carrot fly and cabbage root fly. IOBC/WPRS Bulletin 22 (5): 15-24.</p>
+<p>Markkula, I., A. Hannukkala, A. Lehtinen, I. Mattila, H. Ojanen, S. Raisjio, P. Reijonen and K. Tiilikkala. 2000. Pest warnings and forecasts sent as SMS messages from models into "farmer's pocket". In publication: Pests & Diseases 2000. Proceedings of an international conference held at the Brighton Hilton Metropole Hotel, UK, 13-16 November 2000. BCPC Conference Proceedings pages 285-290.</p>
+<p> </p>
+<p><strong>Contacts</strong></p>
+<p>Annette Folkedal Schjøll <a href="mailto:annette.folkedal.schjoll@nibio.no">annette.folkedal.schjoll@nibio.no</a><br />Tor J. Johansen <a href="mailto:tor.johansen@nibio.no">tor.johansen@nibio.no</a></p>
+<h3>Links for more information (Norwegian only)</h3>
+<p>Plantevernleksikonet/gulrotflue <a href="https://www.plantevernleksikonet.no/l/oppslag/62/">https://www.plantevernleksikonet.no/l/oppslag/62/</a></p>
+<p>Plantevernguiden/gulrotflue: <a href="http://www.plantevernguiden.no/index.jsp?hideAlert=true&crop1=10&crop2=1_406&pest1=3&pest2=1_62&preparation1=-1&action=search&searchString">http://www.plantevernguiden.no/index.jsp?hideAlert=true&crop1=10&crop2=1_406&pest1=3&pest2=1_62&preparation1=-1&action=search&searchString</a></p>
### Development
diff --git a/pom.xml b/pom.xml
index fdf406dbc8adaf2622e72299bf8c2d70dd1e9308..a5460b0bf885ec53eedb577dfba4ce1dba08ad39 100755
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
<groupId>no.nibio.vips.model</groupId>
<artifactId>PsilaRosaeTempModel</artifactId>
- <version>1.1.2</version>
+ <version>1.1.3-SNAPSHOT</version>
<packaging>jar</packaging>
<properties>
@@ -23,7 +23,7 @@
<dependency>
<groupId>no.nibio.vips</groupId>
<artifactId>VIPSCommon</artifactId>
- <version>2.0.1</version>
+ <version>2.0.2</version>
</dependency>
<dependency>
<groupId>junit</groupId>
diff --git a/src/main/java/no/nibio/vips/model/psilarosaetempmodel/PsilaRosaeTempModel.java b/src/main/java/no/nibio/vips/model/psilarosaetempmodel/PsilaRosaeTempModel.java
index 7763b946224efd8838f111c4b0b1a06fda2c30b8..219f2aad6386568882f0ab4b191433045990343c 100755
--- a/src/main/java/no/nibio/vips/model/psilarosaetempmodel/PsilaRosaeTempModel.java
+++ b/src/main/java/no/nibio/vips/model/psilarosaetempmodel/PsilaRosaeTempModel.java
@@ -134,21 +134,23 @@ public class PsilaRosaeTempModel extends I18nImpl implements Model {
@Override
public String getLicense() {
- return "Copyright (c) 2015-2021 NIBIO <http://www.nibio.no/>. \n" +
- "\n" +
- "This file is part of PsilaRosaeTempModel. \n" +
- "PsilaRosaeTempModel 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" +
- "PsilaRosaeTempModel 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" +
- "" +
- "You should have received a copy of the NIBIO Open Source License \n" +
- "along with PsilaRosaeTempModel. If not, see <http://www.nibio.no/licenses/>. \n";
+ return "/*\n" +
+ " * Copyright (c) 2016 NIBIO <http://www.nibio.no/>. \n" +
+ " * \n" +
+ " * This file is part of PsilaRosaeTempModel.\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" +
+ " */";
}
@Override
diff --git a/src/main/resources/images/plh-2007-0232.jpg b/src/main/resources/images/plh-2007-0232.jpg
index 95c24b6bd8109264adb8ce483011cca63cfcd83d..9d1b4a5d17644944aacfd3096b8e6f46e3446cc9 100644
Binary files a/src/main/resources/images/plh-2007-0232.jpg and b/src/main/resources/images/plh-2007-0232.jpg differ
diff --git a/src/main/resources/images/plh-2007-0232_old.jpg b/src/main/resources/images/plh-2007-0232_old.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..95c24b6bd8109264adb8ce483011cca63cfcd83d
Binary files /dev/null and b/src/main/resources/images/plh-2007-0232_old.jpg differ
diff --git a/src/main/resources/no/nibio/vips/model/psilarosaetempmodel/texts.properties b/src/main/resources/no/nibio/vips/model/psilarosaetempmodel/texts.properties
index fb23f84b4adfb7d87063d49f6418552726ca8b66..74c6d0e43483c7f22191d3d084ecc6208052bc89 100755
--- a/src/main/resources/no/nibio/vips/model/psilarosaetempmodel/texts.properties
+++ b/src/main/resources/no/nibio/vips/model/psilarosaetempmodel/texts.properties
@@ -18,4 +18,4 @@
name=Carrot rust fly (Psila rosae) temperature model
usage=Description of required input parameters:\n\ntimeZone - What timezone the calculation is for. Necessary to calculate daily values from the provided hourly values. See this list of time zones: http://en.wikipedia.org/wiki/List_of_tz_database_time_zones (Column "TZ")\n\nobservations - list of weather data. The following parameters are required:\n* TM - Mean temperature in deg Celcius\n\nThe model starts aggregating the day degrees from the earliest weather data provided in the input data\n\nThese should all be complete timeseries of daily data from the same time period. The model accepts hourly data as well, and aggregates these into daily values.
statusInterpretation=<h3>Explanation of the graph</h3>\n<p>The graphic presentation shows the progress of the day-degree calculation (the line: «Accumulated day-degrees with the base temperature of 5 degrees C») that is the basis for the green, yellow and red warnings (the warning status in the table). The graph show straight horizontal lines for the threshold values. «Day-degree threshold for low likelihood of attack» corresponds to when the warning changes from green to yellow (260 day-degrees). «Day-degree threshold for high likelihood of attack » corresponds to when the warning changes from yellow to red (360 day-degrees). «Day-degree threshold for end of flight period» corresponds to when the warning changes from red to grey (560 day-degrees) and the flight period for the 1st generation is considered to be over. When the line « Accumulated day-degrees with the base temperature of 5 degrees C» intersects one of the lines for the day-degree threshold, the warning will advance to the next level and the color of the warning rectangle will change. The graph also shows the daily mean temperature for the relevant weather station.</p>\n<p>The graph is dynamic and the user can choose which parameters that are shown by clicking on the explanation below the graph.</p>\n<h3>Explanation of the table</h3>\n<p>Green warning indicates that the flight period has not yet begun.</p>\n<p>Yellow warning indicates that the flight period is beginning and that flies can be coming into the field.</p>\n<p>Red warning indicates peak flight period.</p>\n<p>Grey warning indicates that the flight period of the 1st generation is over.</p>\n<p>Be aware that in areas with field covers (plastic, single or double non-woven covers, etc.) with early crops the preceding season (either on the current field or neighboring fields), the flight period can start earlier due to higher soil temperature under the covers.</p>
-description=<p>{{filename="/images/plh-2007-0232.jpg" description="Foto: NIBIO Plantehelse"}}</p>\n<h3>Description of the model</h3>\n<p>The warning system model «Carrot rust fly temperature» is based on a Finnish temperature-based model (Markkula <em>et al</em>, 1998; Tiilikkala & Ojanen, 1999; Markkula <em>et al</em>, 2000). The model determines the start of the flight period for the 1st and 2nd generation of carrot rust fly based on accumuleted degree-days (day-degrees) over a base temperature of 5,0 °C. VIPS uses the model for the 1st generation only.</p>\n<p>Standard air temperature (temperature measured 2 m above ground) is used in the model. Degree-days are defined for this model as the sum of the difference between a base temperature of 5,0 °C and the mean temperature for all days with a temperature >5,0 °C, in other words (daily mean temperature – 5,0 °C) from 1 March (beginning when the ground has thawed).</p>\n<h3>Interpretation of the warning</h3>\n<p>Green rectangles indicate that the flight period has not yet begun. The accumulated day-degrees are < 260 degree-days (day-degrees).</p>\n<p>Yellow rectangles indicate that the flight period is beginning and that flies can be coming into the field. The accumulated day-degrees are ≥ 260 degree-days (day-degrees).</p>\n<p>Red rectangles indicate peak flight period. The accumulated day-degrees are ≥ 360 degree-days (day-degrees).</p>\n<p>Grey rectangles indicate that the flight period of the 1st generation is over. The accumulated day-degrees are ≥ 560 degree-days (day-degrees).</p>\n<p>Be aware that in areas with field covers (plastic, single or double non-woven covers, etc.) with early crops the preceding season (either on the current field or neighboring fields), the flight period can start earlier due to higher soil temperature under the covers.</p>\n<p>The graphic presentation shows the progress of the day-degree calculation that is the basis for the green, yellow and red warnings (the line: «Accumulated day-degrees with the base temperature of 5 degrees C»). The graph show straight horizontal lines for the threshold values. «Day-degree threshold for low likelihood of attack» corresponds to when the warning changes from green to yellow (260 day-degrees). «Day-degree threshold for high likelihood of attack » corresponds to when the warning changes from yellow to red (360 day-degrees). «Day-degree threshold for end of flight period» corresponds to when the warning changes from red to grey (560 day-degrees) and the flight period for the 1st generation is considered to be over. When the line « Accumulated day-degrees with the base temperature of 5 degrees C» intersects one of the lines for the day-degree threshold, the warning will advance to the next level and the color of the warning rectangle will change. The graph also shows the daily mean temperature for the relevant weather station. The graph is dynamic and the user can choose which parameters that are shown by clicking on the explanation below the graph.</p>\n<h3>Warning season – start and end of the warning</h3>\n<p>Starting time: Shown in VIPS from 1 April (starting date for accumulation of degree-days beginning from when the ground has thawed).<br /> Ending time: When the model has reached the requirement for the end of the flight period for the 1st generation (560 day-degrees).</p>\n<h3>Testing and validation of the model</h3>\n<h4>National</h4>\n<p>The model has been tested for Norwegian conditions in the period of 2011-2015. Validation has shown that the model was accurate for most locations for the 1st generation. The model was, however, inaccurate for the 2nd generation for many locations and was totally incorrect for the district of Jæren. Based on the validation results, we have therefore chosen to remove warning of the 2nd generation of carrot rust fly from this model.</p>\n<h4>International</h4>\n<p>The model is in use in Finland. The extent to which the model has been validated in Finland is uncertain, but a validation was done in the summer of 1997. This validation showed that the model was quite accurate, but that the threshold temperature sm should be lowered to 255 day-degrees for the start of the flight period (as opposed to 260 degree-days in the original model) and 355 degree-days forthe peak flight period (as opposed to 360 degree-days in the original model) (Tiilikkala & Ojanen, 1999).</p>\n<h3>Literature</h3>\n<p>Markkula, I., H. Ojanen and K. Tiilikkala. 1998. Forecasting and monitoring of the carrot fly (<em>Psila rosae</em>) in Finland. The 1998 Brighton Conference: Pests and Diseases: Conference Proceedings, Volume 2, pages 657-662.</p>\n<p>Tiilikkala, K. and H. Ojanen. 1999. Use of a geographical information system (GIS) for forecasting the activities of carrot fly and cabbage root fly. IOBC/WPRS Bulletin 22 (5): 15-24.</p>\n<p>Markkula, I., A. Hannukkala, A. Lehtinen, I. Mattila, H. Ojanen, S. Raisjio, P. Reijonen and K. Tiilikkala. 2000. Pest warnings and forecasts sent as SMS messages from models into "farmer's pocket". In publication: Pests & Diseases 2000. Proceedings of an international conference held at the Brighton Hilton Metropole Hotel, UK, 13-16 November 2000. BCPC Conference Proceedings pages 285-290.</p>\n<p> </p>\n<p><strong>Contacts</strong></p>\n<p>Annette Folkedal Schjøll <a href="mailto:annette.folkedal.schjoll@nibio.no">annette.folkedal.schjoll@nibio.no</a><br />Tor J. Johansen <a href="mailto:tor.johansen@nibio.no">tor.johansen@nibio.no</a></p>\n<h3>Links for more information (Norwegian only)</h3>\n<p>Plantevernleksikonet/gulrotflue <a href="https://www.plantevernleksikonet.no/l/oppslag/62/">https://www.plantevernleksikonet.no/l/oppslag/62/</a></p>\n<p>Plantevernguiden/gulrotflue: <a href="http://www.plantevernguiden.no/index.jsp?hideAlert=true&crop1=10&crop2=1_406&pest1=3&pest2=1_62&preparation1=-1&action=search&searchString">http://www.plantevernguiden.no/index.jsp?hideAlert=true&crop1=10&crop2=1_406&pest1=3&pest2=1_62&preparation1=-1&action=search&searchString</a></p>
+description=<p>{{filename="/images/plh-2007-0232.jpg" description="Foto: Lars-Arne Høgetveit, NLR Viken"}}</p>\n<h3>Description of the model</h3>\n<p>The warning system model «Carrot rust fly temperature» is based on a Finnish temperature-based model (Markkula <em>et al</em>, 1998; Tiilikkala & Ojanen, 1999; Markkula <em>et al</em>, 2000). The model determines the start of the flight period for the 1st and 2nd generation of carrot rust fly based on accumuleted degree-days (day-degrees) over a base temperature of 5,0 °C. VIPS uses the model for the 1st generation only.</p>\n<p>Standard air temperature (temperature measured 2 m above ground) is used in the model. Degree-days are defined for this model as the sum of the difference between a base temperature of 5,0 °C and the mean temperature for all days with a temperature >5,0 °C, in other words (daily mean temperature – 5,0 °C) from 1 March (beginning when the ground has thawed).</p>\n<h3>Interpretation of the warning</h3>\n<p>Green rectangles indicate that the flight period has not yet begun. The accumulated day-degrees are < 260 degree-days (day-degrees).</p>\n<p>Yellow rectangles indicate that the flight period is beginning and that flies can be coming into the field. The accumulated day-degrees are ≥ 260 degree-days (day-degrees).</p>\n<p>Red rectangles indicate peak flight period. The accumulated day-degrees are ≥ 360 degree-days (day-degrees).</p>\n<p>Grey rectangles indicate that the flight period of the 1st generation is over. The accumulated day-degrees are ≥ 560 degree-days (day-degrees).</p>\n<p>Be aware that in areas with field covers (plastic, single or double non-woven covers, etc.) with early crops the preceding season (either on the current field or neighboring fields), the flight period can start earlier due to higher soil temperature under the covers.</p>\n<p>The graphic presentation shows the progress of the day-degree calculation that is the basis for the green, yellow and red warnings (the line: «Accumulated day-degrees with the base temperature of 5 degrees C»). The graph show straight horizontal lines for the threshold values. «Day-degree threshold for low likelihood of attack» corresponds to when the warning changes from green to yellow (260 day-degrees). «Day-degree threshold for high likelihood of attack » corresponds to when the warning changes from yellow to red (360 day-degrees). «Day-degree threshold for end of flight period» corresponds to when the warning changes from red to grey (560 day-degrees) and the flight period for the 1st generation is considered to be over. When the line « Accumulated day-degrees with the base temperature of 5 degrees C» intersects one of the lines for the day-degree threshold, the warning will advance to the next level and the color of the warning rectangle will change. The graph also shows the daily mean temperature for the relevant weather station. The graph is dynamic and the user can choose which parameters that are shown by clicking on the explanation below the graph.</p>\n<h3>Warning season – start and end of the warning</h3>\n<p>Starting time: Shown in VIPS from 1 April (starting date for accumulation of degree-days beginning from when the ground has thawed).<br /> Ending time: When the model has reached the requirement for the end of the flight period for the 1st generation (560 day-degrees).</p>\n<h3>Testing and validation of the model</h3>\n<h4>National</h4>\n<p>The model has been tested for Norwegian conditions in the period of 2011-2015. Validation has shown that the model was accurate for most locations for the 1st generation. The model was, however, inaccurate for the 2nd generation for many locations and was totally incorrect for the district of Jæren. Based on the validation results, we have therefore chosen to remove warning of the 2nd generation of carrot rust fly from this model.</p>\n<h4>International</h4>\n<p>The model is in use in Finland. The extent to which the model has been validated in Finland is uncertain, but a validation was done in the summer of 1997. This validation showed that the model was quite accurate, but that the threshold temperature sm should be lowered to 255 day-degrees for the start of the flight period (as opposed to 260 degree-days in the original model) and 355 degree-days forthe peak flight period (as opposed to 360 degree-days in the original model) (Tiilikkala & Ojanen, 1999).</p>\n<h3>Literature</h3>\n<p>Markkula, I., H. Ojanen and K. Tiilikkala. 1998. Forecasting and monitoring of the carrot fly (<em>Psila rosae</em>) in Finland. The 1998 Brighton Conference: Pests and Diseases: Conference Proceedings, Volume 2, pages 657-662.</p>\n<p>Tiilikkala, K. and H. Ojanen. 1999. Use of a geographical information system (GIS) for forecasting the activities of carrot fly and cabbage root fly. IOBC/WPRS Bulletin 22 (5): 15-24.</p>\n<p>Markkula, I., A. Hannukkala, A. Lehtinen, I. Mattila, H. Ojanen, S. Raisjio, P. Reijonen and K. Tiilikkala. 2000. Pest warnings and forecasts sent as SMS messages from models into "farmer's pocket". In publication: Pests & Diseases 2000. Proceedings of an international conference held at the Brighton Hilton Metropole Hotel, UK, 13-16 November 2000. BCPC Conference Proceedings pages 285-290.</p>\n<p> </p>\n<p><strong>Contacts</strong></p>\n<p>Annette Folkedal Schjøll <a href="mailto:annette.folkedal.schjoll@nibio.no">annette.folkedal.schjoll@nibio.no</a><br />Tor J. Johansen <a href="mailto:tor.johansen@nibio.no">tor.johansen@nibio.no</a></p>\n<h3>Links for more information (Norwegian only)</h3>\n<p>Plantevernleksikonet/gulrotflue <a href="https://www.plantevernleksikonet.no/l/oppslag/62/">https://www.plantevernleksikonet.no/l/oppslag/62/</a></p>\n<p>Plantevernguiden/gulrotflue: <a href="http://www.plantevernguiden.no/index.jsp?hideAlert=true&crop1=10&crop2=1_406&pest1=3&pest2=1_62&preparation1=-1&action=search&searchString">http://www.plantevernguiden.no/index.jsp?hideAlert=true&crop1=10&crop2=1_406&pest1=3&pest2=1_62&preparation1=-1&action=search&searchString</a></p>
diff --git a/src/main/resources/no/nibio/vips/model/psilarosaetempmodel/texts_nb.properties b/src/main/resources/no/nibio/vips/model/psilarosaetempmodel/texts_nb.properties
index 01e6ddba5590b5b071f0d66585dd4d8271f4b0cd..7447ee051baab905fe23c9edcaeedb8ff1d2733b 100755
--- a/src/main/resources/no/nibio/vips/model/psilarosaetempmodel/texts_nb.properties
+++ b/src/main/resources/no/nibio/vips/model/psilarosaetempmodel/texts_nb.properties
@@ -18,4 +18,4 @@
name=Gulrotflue-svermetidspunktmodell
usage=Description of required input parameters:\n\ntimeZone - What timezone the calculation is for. Necessary to calculate daily values from the provided hourly values. See this list of time zones: http://en.wikipedia.org/wiki/List_of_tz_database_time_zones (Column "TZ")\n\nobservations - list of weather data. The following parameters are required:\n* TM - Mean temperature in deg Celcius\n\nThe model starts aggregating the day degrees from the earliest weather data provided in the input data\n\nThese should all be complete timeseries of daily data from the same time period. The model accepts hourly data as well, and aggregates these into daily values.
statusInterpretation=<h2>Forklaring til grafen</h2>\n<p>Den grafiske presentasjonen viser utviklingen av døgngradsberegningen (linjen: «Akkumulerte døgngrader med basistemperatur 5 grader C») som ligger til grunn for de grønne, gule og røde varslene (varselstatus i tabellen)). Grafen viser rette horisontale linjer for terskelverdiene. «Døgngradsterskel for lav svermerisiko» tilsvarer terskelen der varsel går fra grønt til gult (260 døgngrader). «Døgngradsterskel for høy svermerisiko» tilsvarer terskelen der varsel går fra gult til rødt (360 døgngrader). «Døgngradsterskel for sverming avsluttet» tilsvarer terskelen der varsel går fra rødt til grått (560 døgngrader) og sverming av 1. generasjon gulrotflue ansees å være over. Når linjen «Akkumulerte døgngrader med basistemperatur 5 grader C» krysser en av linjene for døgngradsterskel, vil varslet nå neste nivå og fargen på varslingsboksene endres. I grafen vises også døgnverdien for middeltemperatur for den aktuelle værstasjonen.</p>\n<p>Grafen er dynamisk og man kan velge hvilke parametere som skal vises ved å trykke på forklaringstekstene under grafen.</p>\n<h2>Forklaring til tabellen</h2>\n<ul>\n<li>Når varselstatus er grønn, betyr dette at svermingen enda ikke har begynt.</li>\n<li>Når varselstatus er gul, betyr dette at svermingen er i startfasen og at man må være obs på at det kan komme innflyvere i åkeren.</li>\n<li>Når varselstatus er rød, betyr dette at svermingen er på sitt mest aktive.</li>\n<li>Når varselstatus er grå, betyr dette at svermingen av 1. generasjon er over og varslingen er avsluttet.</li>\n</ul>\n<p>Vær klar over at i områder med dekke (plast, enkel og dobbel fiberduk el. lign.) ved tidligproduksjon (enten på samme jorde eller nabojorder) året før, kan svermingen starte tidligere på grunn av høyere jordtemperatur under dekket.</p>
-description=<p>{{filename="/images/plh-2007-0232.jpg" description="Foto: NIBIO Plantehelse"}}</p>\n<h2>Modellbeskrivelse</h2>\n<p>Varslingsmodellen «Gulrotflue svermetidspunkt» er basert på en finsk, temperaturbasert modell (Markkula <em>et al</em>, 1998; Tiilikkala & Ojanen, 1999; Markkula <em>et al</em>, 2000). Modellen beregner tidspunkt for sverming av 1. generasjon og 2. generasjon av gulrotflue basert på akkumulering av graddager (døgngrader) over en basistemperatur på 5 °C. I VIPS benyttes modellen kun for 1. generasjon.</p>\n<p>Det er standard lufttemperatur (temperatur målt 2 m over bakken) som benyttes i modellen. Graddager er her definert som summen av differansen mellom en basistemperatur på 5 °C og døgnmiddeltemperatur for alle døgn med temperatur >5 °C dvs. summen av (døgnmiddeltemperatur - 5 °C) fra 1. mars (fra det er telefritt i jorda).</p>\n<h2>Tolking av varsel</h2>\n<p>Grønne bokser betyr at svermingen enda ikke har begynt. Akkumulering av døgngrader er < 260 graddager (døgngrader).</p>\n<p>Gule bokser betyr svermingen er i startfasen og at man må være obs på at det kan komme innflyvere i åkeren. Akkumulering av døgngrader er ≥ 260 graddager (døgngrader).</p>\n<p>Røde bokser betyr svermingen er på sitt mest aktive. Akkumulering av døgngrader er ≥ 360 graddager (døgngrader).</p>\n<p>Grå bokser betyr at svermingen av 1. generasjon er over og varslingen er avsluttet. Akkumulering av døgngrader er ≥ 560 graddager (døgngrader).</p>\n<p>Vær klar over at i områder med dekke (plast, enkel og dobbel fiberduk el. lign.) ved tidligproduksjon (enten på samme jorde eller nabojorder) året før, kan svermingen starte tidligere på grunn av høyere jordtemperatur under dekket.</p>\n<p>Den grafiske presentasjonen viser utviklingen av døgngradsberegningen som ligger til grunn for de grønne, gule og røde varslene (linjen: «Akkumulerte døgngrader med basistemperatur 5 grader C»). Grafen viser rette horisontale linjer for terskelverdiene. «Døgngradsterskel for lav svermerisiko» tilsvarer terskelen der varsel går fra grønt til gult (260 døgngrader). «Døgngradsterskel for høy svermerisiko» tilsvarer terskelen der varsel går fra gult til rødt (360 døgngrader). «Døgngradsterskel for sverming avsluttet» tilsvarer terskelen der varsel går fra rødt til grått (560 døgngrader) og sverming av 1. generasjon gulrotflue ansees å være over. Når linjen «Akkumulerte døgngrader med basistemperatur 5 grader C» krysser en av linjene for døgngradsterskel, vil varslet nå neste nivå og fargen på varslingsboksene endres. I grafen vises også døgnverdien for middeltemperatur for den aktuelle værstasjonen. Grafen er dynamisk og man kan velge hvilke parametere som skal vises ved å trykke på forklaringstekstene under grafen.</p>\n<h2>Varslingssesong – oppstart og avslutning av varsel</h2>\n<p>Starttidspunkt: Vises i VIPS fra 1. april (startdato for akkumulering av graddager fra det er telefritt) i jorda.</p>\n<p>Sluttidspunkt: Når modellen har nådd kravet til døgngrader for avsluttet sverming av 1. generasjon (560 døgngrader).</p>\n<h2>Utprøving og validering av modellen</h2>\n<h3>Nasjonalt</h3>\n<p>Modellen har vært testet og evaluert for norske forhold i perioden 2011-2015. Valideringen har vist at modellen stemte ganske bra for de fleste steder for 1. generasjon. Modellen stemte imidlertid dårlig for 2. generasjon for mange lokaliteter og var direkte feil for Jæren-distriktet. På bakgrunn av resultatene fra valideringen har vi derfor valgt å fjerne varsling av 2. generasjon gulrotflue med denne modellen.</p>\n<h3>Internasjonalt</h3>\n<p>Modellen er i bruk i Finland. Det er usikkert hvor omfattende modellen er validert i Finland, men det er utført en validering sommeren 1997. Denne valideringen tilsa at modellen stemte nokså bra, men at terskeltemperatursummen burde reduseres til 255 graddager for svermingsstart (mot 260 graddager i den opprinnelige modellen) og 355 graddager for svermetoppen (mot 360 daggrader i den opprinnelige modellen) (Tiilikkala & Ojanen, 1999).</p>\n<h2>Referanser</h2>\n<ul>\n<li>Markkula, I., H. Ojanen and K. Tiilikkala. 1998. Forecasting and monitoring of the carrot fly (Psila rosae) in Finland. The 1998 Brighton Conference: Pests and Diseases: Conference Proceedings, Volume 2, pages 657-662.</li>\n<li>Tiilikkala, K. and H. Ojanen. 1999. Use of a geographical information system (GIS) for forecasting the activities of carrot fly and cabbage root fly. IOBC/WPRS Bulletin 22 (5): 15-24.</li>\n<li>Markkula, I., A. Hannukkala, A. Lehtinen, I. Mattila, H. Ojanen, S. Raisjio, P. Reijonen and K. Tiilikkala. 2000. Pest warnings and forecasts sent as SMS messages from models into "farmer's pocket". In publication: Pests & Diseases 2000. Proceedings of an international conference held at the Brighton Hilton Metropole Hotel, UK, 13-16 November 2000. BCPC Conference Proceedings pages 285-290.</li>\n</ul>\n<h2>Kontaktpersoner</h2>\n<ul>\n<li><a href="http://www.nibio.no/ansatte/annette_folkedalschjll" target="new">Annette Folkedal Schjøll</a></li>\n<li><a href="http://www.nibio.no/ansatte/tor_johansen" target="new">Tor J. Johansen</a></li>\n</ul>\n<h2>Lenker til mer informasjon</h2>\n<ul>\n<li><a href="http://leksikon.nibio.no/vieworganism.php?organismId=1_62&showMacroOrganisms=false" target="new">Plantevernleksikonet/gulrotflue</a></li>\n<li><a href="http://www.plantevernguiden.no/index.jsp?hideAlert=true&crop1=10&crop2=1_406&pest1=3&pest2=1_62&preparation1=-1&action=search&searchString=" target="new">Plantevernguiden/gulrotflue</a></li>\n</ul>
+description=<p>{{filename="/images/plh-2007-0232.jpg" description="Foto: Lars-Arne Høgetveit, NLR Viken"}}</p>\n<h2>Modellbeskrivelse</h2>\n<p>Varslingsmodellen «Gulrotflue svermetidspunkt» er basert på en finsk, temperaturbasert modell (Markkula <em>et al</em>, 1998; Tiilikkala & Ojanen, 1999; Markkula <em>et al</em>, 2000). Modellen beregner tidspunkt for sverming av 1. generasjon og 2. generasjon av gulrotflue basert på akkumulering av graddager (døgngrader) over en basistemperatur på 5 °C. I VIPS benyttes modellen kun for 1. generasjon.</p>\n<p>Det er standard lufttemperatur (temperatur målt 2 m over bakken) som benyttes i modellen. Graddager er her definert som summen av differansen mellom en basistemperatur på 5 °C og døgnmiddeltemperatur for alle døgn med temperatur >5 °C dvs. summen av (døgnmiddeltemperatur - 5 °C) fra 1. mars (fra det er telefritt i jorda).</p>\n<h2>Tolking av varsel</h2>\n<p>Grønne bokser betyr at svermingen enda ikke har begynt. Akkumulering av døgngrader er < 260 graddager (døgngrader).</p>\n<p>Gule bokser betyr svermingen er i startfasen og at man må være obs på at det kan komme innflyvere i åkeren. Akkumulering av døgngrader er ≥ 260 graddager (døgngrader).</p>\n<p>Røde bokser betyr svermingen er på sitt mest aktive. Akkumulering av døgngrader er ≥ 360 graddager (døgngrader).</p>\n<p>Grå bokser betyr at svermingen av 1. generasjon er over og varslingen er avsluttet. Akkumulering av døgngrader er ≥ 560 graddager (døgngrader).</p>\n<p>Vær klar over at i områder med dekke (plast, enkel og dobbel fiberduk el. lign.) ved tidligproduksjon (enten på samme jorde eller nabojorder) året før, kan svermingen starte tidligere på grunn av høyere jordtemperatur under dekket.</p>\n<p>Den grafiske presentasjonen viser utviklingen av døgngradsberegningen som ligger til grunn for de grønne, gule og røde varslene (linjen: «Akkumulerte døgngrader med basistemperatur 5 grader C»). Grafen viser rette horisontale linjer for terskelverdiene. «Døgngradsterskel for lav svermerisiko» tilsvarer terskelen der varsel går fra grønt til gult (260 døgngrader). «Døgngradsterskel for høy svermerisiko» tilsvarer terskelen der varsel går fra gult til rødt (360 døgngrader). «Døgngradsterskel for sverming avsluttet» tilsvarer terskelen der varsel går fra rødt til grått (560 døgngrader) og sverming av 1. generasjon gulrotflue ansees å være over. Når linjen «Akkumulerte døgngrader med basistemperatur 5 grader C» krysser en av linjene for døgngradsterskel, vil varslet nå neste nivå og fargen på varslingsboksene endres. I grafen vises også døgnverdien for middeltemperatur for den aktuelle værstasjonen. Grafen er dynamisk og man kan velge hvilke parametere som skal vises ved å trykke på forklaringstekstene under grafen.</p>\n<h2>Varslingssesong – oppstart og avslutning av varsel</h2>\n<p>Starttidspunkt: Vises i VIPS fra 1. april (startdato for akkumulering av graddager fra det er telefritt) i jorda.</p>\n<p>Sluttidspunkt: Når modellen har nådd kravet til døgngrader for avsluttet sverming av 1. generasjon (560 døgngrader).</p>\n<h2>Utprøving og validering av modellen</h2>\n<h3>Nasjonalt</h3>\n<p>Modellen har vært testet og evaluert for norske forhold i perioden 2011-2015. Valideringen har vist at modellen stemte ganske bra for de fleste steder for 1. generasjon. Modellen stemte imidlertid dårlig for 2. generasjon for mange lokaliteter og var direkte feil for Jæren-distriktet. På bakgrunn av resultatene fra valideringen har vi derfor valgt å fjerne varsling av 2. generasjon gulrotflue med denne modellen.</p>\n<h3>Internasjonalt</h3>\n<p>Modellen er i bruk i Finland. Det er usikkert hvor omfattende modellen er validert i Finland, men det er utført en validering sommeren 1997. Denne valideringen tilsa at modellen stemte nokså bra, men at terskeltemperatursummen burde reduseres til 255 graddager for svermingsstart (mot 260 graddager i den opprinnelige modellen) og 355 graddager for svermetoppen (mot 360 daggrader i den opprinnelige modellen) (Tiilikkala & Ojanen, 1999).</p>\n<h2>Referanser</h2>\n<ul>\n<li>Markkula, I., H. Ojanen and K. Tiilikkala. 1998. Forecasting and monitoring of the carrot fly (Psila rosae) in Finland. The 1998 Brighton Conference: Pests and Diseases: Conference Proceedings, Volume 2, pages 657-662.</li>\n<li>Tiilikkala, K. and H. Ojanen. 1999. Use of a geographical information system (GIS) for forecasting the activities of carrot fly and cabbage root fly. IOBC/WPRS Bulletin 22 (5): 15-24.</li>\n<li>Markkula, I., A. Hannukkala, A. Lehtinen, I. Mattila, H. Ojanen, S. Raisjio, P. Reijonen and K. Tiilikkala. 2000. Pest warnings and forecasts sent as SMS messages from models into "farmer's pocket". In publication: Pests & Diseases 2000. Proceedings of an international conference held at the Brighton Hilton Metropole Hotel, UK, 13-16 November 2000. BCPC Conference Proceedings pages 285-290.</li>\n</ul>\n<h2>Kontaktpersoner</h2>\n<ul>\n<li><a href="http://www.nibio.no/ansatte/annette_folkedalschjll" target="new">Annette Folkedal Schjøll</a></li>\n<li><a href="http://www.nibio.no/ansatte/tor_johansen" target="new">Tor J. Johansen</a></li>\n</ul>\n<h2>Lenker til mer informasjon</h2>\n<ul>\n<li><a href="http://leksikon.nibio.no/vieworganism.php?organismId=1_62&showMacroOrganisms=false" target="new">Plantevernleksikonet/gulrotflue</a></li>\n<li><a href="http://www.plantevernguiden.no/index.jsp?hideAlert=true&crop1=10&crop2=1_406&pest1=3&pest2=1_62&preparation1=-1&action=search&searchString=" target="new">Plantevernguiden/gulrotflue</a></li>\n</ul>