From d1670c9ac5537b4d34eb4990b6fac6e0d74d29b1 Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@nibio.no>
Date: Wed, 15 Mar 2023 13:12:51 +0100
Subject: [PATCH] Add model usage text

---
 .../septoriaapiicolamodel/SeptoriaApiicolaModel.java      | 8 ++++----
 .../vips/model/septoriaapiicolamodel/texts.properties     | 2 +-
 .../vips/model/septoriaapiicolamodel/texts_nb.properties  | 2 +-
 .../septoriaapiicolamodel/SeptoriaApiicolaModelTest.java  | 1 +
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/main/java/no/nibio/vips/model/septoriaapiicolamodel/SeptoriaApiicolaModel.java b/src/main/java/no/nibio/vips/model/septoriaapiicolamodel/SeptoriaApiicolaModel.java
index c29d892..89a4f61 100755
--- a/src/main/java/no/nibio/vips/model/septoriaapiicolamodel/SeptoriaApiicolaModel.java
+++ b/src/main/java/no/nibio/vips/model/septoriaapiicolamodel/SeptoriaApiicolaModel.java
@@ -210,10 +210,10 @@ public class SeptoriaApiicolaModel extends I18nImpl implements Model{
                 "\t\t\"startDateGrowth\":\"2012-03-25\",\n" +
                 "\t\t\"endDateCalculation\":\"2012-03-25\",\n" +
                 "\t\t\"pestObservations\":[\n" +
-                "\t\t\t{" +
-                "\t\t\t\t\"timeOfObservation\":\"2016-04-20T00:00:00+02:00\"," +
-                "\t\t\t\t\"observationData\":{}" +
-                "\t\t\t\"}" +
+                "\t\t\t{\n" +
+                "\t\t\t\t\"timeOfObservation\":\"2016-04-20T00:00:00+02:00\",\n" +
+                "\t\t\t\t\"observationData\":{}\n" +
+                "\t\t\t}\n" +
                 "\t\t],\n" +
                 "\t\t\"observations\":[\n" +
                 "\t\t{\n" +
diff --git a/src/main/resources/no/nibio/vips/model/septoriaapiicolamodel/texts.properties b/src/main/resources/no/nibio/vips/model/septoriaapiicolamodel/texts.properties
index b9f89c3..9b88fe8 100755
--- a/src/main/resources/no/nibio/vips/model/septoriaapiicolamodel/texts.properties
+++ b/src/main/resources/no/nibio/vips/model/septoriaapiicolamodel/texts.properties
@@ -18,4 +18,4 @@
 name=Septoria apiicola model
 description={{filename="/images/septoriaapiicola.jpg" description="Selleribladflekk i stangselleri (Foto: E. Fl&oslash;istad, NIBIO)"}}\n<p>This model is based on a calculation of how leaf wetness periods influence \ninfection of celery by <em>Septoria apiicola</em> in susceptible host plants.<p>\n<p>Forecasts of infection risk are given after a minimum of 12 consecutive hours \nof leaf wetness. The wet periods are calculated from sensors placed 30 cm above \nground. If such a sensor is not available, data from leaf wetness sensors placed \n2 m above ground are used.</p>\n<p>The model is developed in Michigan, USA and published by Lacy, 1994.</p> \n<p>It is generally assumed that this model has additional relevance for Septoria petroselini in parsley.</p> \n<h3>Warning interpretation</h3>\n<p><em>The following recommendations are provided for the Norwegian celery production.</em></p>\n<p>The model is a tool to decide when to start looking for initial disease \noutbreaks. It is not considered accurate enough to provide reliable advice for \ntiming of fungicide applications under Norwegian conditions. </p>\n<p>If inoculum is present, infections are expected to develop 7-14 days after \nthe first infection risk periods (yellow or red warnings). It is recommended to \nintensify field inspections after periods with risk warnings to detect early \ninfections of <em>Septoria apiicola</em>. </p>\n<ul>\n<li>Green: No risk of infection.</li> \n<li>Yellow: Weather conditions favorable for infection risk. No known sources of \ninoculum in the region.</li> \n<li>Red: Risk of infection and infections of Septoria late blight has been \nreported in the nearby region. Disease reports and field inspections are \nperformed in collaboration with advisors in the Norwegian Agricultural Advisory service.</li>\n</ul>\n<p>Graph legend: Blue bars indicate periods of at least 12 consecutive hours of \nleaf wetness. Black bar indicate date of first field observation of Septoria late \nblight.</p>\n<h3>Forecast season (Norway only)</h3>\n<p>In Norway this model is generally started June 1 and ends September 30. </p>\n<p>The model is running on all weather stations located in regions of commercial celery production.</p> \n<h3>Model validation</h3>\n<h4>Norway</h4>\n<p>Validation of this model under Norwegian conditions is ongoing. The current \nrecommendation for this model is as a tool for timing of field inspections. </p>\n<p>Studies of weather conditions, spore production and infection events have been \ncarried out in field trials at \u00c5s from 2012-2016. Preliminary results indicate a \ngood fit, although some adjustments could improve the model, particularly in \nconnection with rain events (Nordskog and Le, 2014). </p>\n<h4>Internationally</h4>\n<p>The model is developed in Michigan, USA and published by Lacy (1994)</p>\n<h3>References</h3>\n<p>Lacy, M.L. 1994. Influence of wetness periods on infection of celery by \n<em>Septoria apiicola</em> and use in timing sprays for control. Plant Disease 78, 975-979.</p>\n<p>Nordskog, B. og Le, V.H. 2015. Varsling av selleribladflekk. Gartneryrket nr 6, s14-15.</p>
 statusInterpretation=<p><em>The following recommendations are provided for the Norwegian celery production.</em></p>\n<p>The model is a tool to decide when to start looking for initial disease \noutbreaks. It is not considered accurate enough to provide reliable advice for \ntiming of fungicide applications under Norwegian conditions. </p>\n<p>If inoculum is present, infections are expected to develop 7-14 days after \nthe first infection risk periods (yellow or red warnings). It is recommended to \nintensify field inspections after periods with risk warnings to detect early \ninfections of <em>Septoria apiicola</em>. </p>\n<ul>\n<li>Green: No risk of infection.</li> \n<li>Yellow: Weather conditions favorable for infection risk. No known sources of \ninoculum in the region.</li> \n<li>Red: Risk of infection and infections of Septoria late blight has been \nreported in the nearby region. Disease reports and field inspections are \nperformed in collaboration with advisors in the Norwegian Agricultural Advisory service.</li>\n</ul>\n<p>Graph legend: Blue bars indicate periods of at least 12 consecutive hours of \nleaf wetness. Black bar indicate date of first field observation of Septoria late \nblight.</p>
-usage=TODO
+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* BT - Leaf wetness (minutes/hour)\n\nThe weather data must be hourly data\n\npestObservations - registrations of the pest in the field. See sample config for structure. The only parameter necessary is the date of the observation. This parameter is not mandatory, it should only be provided if you actually have at least one pest observation
diff --git a/src/main/resources/no/nibio/vips/model/septoriaapiicolamodel/texts_nb.properties b/src/main/resources/no/nibio/vips/model/septoriaapiicolamodel/texts_nb.properties
index 08082d8..a53545c 100755
--- a/src/main/resources/no/nibio/vips/model/septoriaapiicolamodel/texts_nb.properties
+++ b/src/main/resources/no/nibio/vips/model/septoriaapiicolamodel/texts_nb.properties
@@ -1,4 +1,4 @@
 name=Selleribladflekkmodell
 description={{filename="/images/septoriaapiicola.jpg" description="Selleribladflekk i stangselleri (Foto: E. Fl&oslash;istad, NIBIO)"}}\n<h2>Modellbeskrivelse</h2>\n<p>Modellen er basert p&aring; en enkel beregning av n&aring;r v&aelig;rforholdene er fuktige nok til at soppen kan for&aring;rsake infeksjon i mottakelige vertplanter.</p>\n<p>Varsler om infeksjonsfare gis n&aring;r det er registrert minimum 12 timer sammenhengende bladfuktighet. Fuktighetsperiodene beregnes fra registrert bladfuktighet 30 cm over bakken. Ved m&aring;lestasjoner som ikke har sensor p&aring; bakkeniv&aring; brukes bladfuktighet m&aring;lt ved 2 m.</p>\n<p>Modellen er utviklet i USA og publisert av Lacy (1994).&nbsp;</p>\n<p>Det antas at varslingsmodellen ogs&aring; vil v&aelig;re gyldig for persillebladflekk (Septoria petroselini).</p>\n<h2>Tolking av varsel</h2>\n<p>Dersom smitte er til stede kan det forventes &aring; finne angrep 7-14 dager etter varsel om infeksjonsfare (gult eller r&oslash;dt varsel). Det anbefales &aring; intensivere feltinspeksjoner i etterkant av perioder med varsler.</p>\n<ul>\n<li>Gr&oslash;nne bokser betyr at det ikke er fare for infeksjon</li>\n<li>Gule bokser betyr at v&aelig;rforhold tilsier fare for infeksjon. Ingen registrerte angrep.</li>\n<li>R&oslash;de bokser betyr fare for infeksjon. Angrep av selleribladflekk er observert i omr&aring;de/region med tilknytning til gjeldende v&aelig;rstasjon. Observasjoner og registrering av selleribladflekk utf&oslash;res i samarbeid med r&aring;dgivere i Norsk Landbruksr&aring;dgiving.</li>\n</ul>\n<p>Den grafiske presentasjonen viser bl&aring; s&oslash;yler for perioder med minst 12 timer sammenhengende luftfuktighet. Svart s&oslash;yle viser dato for observasjon av selleribladflekk.</p>\n<h2>Varslingssesong &ndash; oppstart og avslutning av varsel</h2>\n<p>Varsler startes ca 1. juni og avsluttes 30. september.</p>\n<p>Varsler beregnes ved v&aelig;rstasjoner i regioner med kommersiell produksjon av selleri.</p>\n<h2>Utpr&oslash;ving og validering av modellen</h2>\n<h3>Nasjonalt</h3>\n<p>Det arbeides med &aring; validere denne varslingsmodellen under norske forhold. Det anbefales forel&oslash;pig &aring; bruke modellen som hjelpemiddel for n&aring;r en b&oslash;r intensivere feltinspeksjoner.</p>\n<p>Detaljerte studier av v&aelig;rforhold, sporedanning og smitteforhold gjennomf&oslash;res i feltfors&oslash;k p&aring; &Aring;s i perioden 2012-2016. Resultater s&aring; langt viser at modellen treffer bra, men at det kan v&aelig;re behov for enkelte justeringer, spesielt i sammenheng med nedb&oslash;rsperioder (Nordskog og Le, 2014). Eventuelle tilpasninger av modellen gj&oslash;res etter at valideringsfors&oslash;kene er avsluttet.</p>\n<h3>Internasjonalt</h3>\n<p>Modellen er utviklet i Michigan, USA og publisert av Lacy (1994)</p>\n<h2>Referanser</h2>\n<p>Lacy, M.L. 1994. Influence of wetness periods on infection of celery by Septoria apiicola and use in timing sprays for control. Plant Disease 78, 975-979.</p>\n<p>Nordskog, B. og Le, V.H. 2015. Varsling av selleribladflekk. Gartneryrket nr 6, s14-15.</p>\n<p>Mer om selleribladflekk og persillebladflekk finner du i <a href="http://leksikon.nibio.no/vieworganism.php?organismId=1_479" target="_blank">Plantevernleksikonet</a></p>\n<p>&nbsp;</p>
 statusInterpretation=<p>Grafen viser bl&aring; s&oslash;yler for perioder med minst 12 timer sammenhengende luftfuktighet. Svart s&oslash;yle viser dato for observasjon av selleribladflekk.</p>\n<p>Gr&oslash;nn, gul, r&oslash;d bakgrunnsfarge samsvarer med daglig varselstatus i kartet p&aring; forsida og i tabellen under.</p>\n<ul>\n<li>Gr&oslash;nn boks: ingen fare for infeksjon</li>\n<li>Gul boks: v&aelig;rforhold tilsier at det er fare for infeksjon, ingen registrerte angrep.</li>\n<li>R&oslash;d boks: fare for infeksjon. Angrep av selleribladflekk er observert i omr&aring;de/region med tilknytning til gjeldende v&aelig;rstasjon.</li>\n</ul>
-usage=TODO
+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* BT - Leaf wetness (minutes/hour)\n\nThe weather data must be hourly data\n\npestObservations - registrations of the pest in the field. See sample config for structure. The only parameter necessary is the date of the observation. This parameter is not mandatory, it should only be provided if you actually have at least one pest observation
diff --git a/src/test/java/no/nibio/vips/model/septoriaapiicolamodel/SeptoriaApiicolaModelTest.java b/src/test/java/no/nibio/vips/model/septoriaapiicolamodel/SeptoriaApiicolaModelTest.java
index b2278db..24e2c2f 100755
--- a/src/test/java/no/nibio/vips/model/septoriaapiicolamodel/SeptoriaApiicolaModelTest.java
+++ b/src/test/java/no/nibio/vips/model/septoriaapiicolamodel/SeptoriaApiicolaModelTest.java
@@ -89,6 +89,7 @@ public class SeptoriaApiicolaModelTest {
         pestObservations.add(obs);
         config.setConfigParameter("pestObservations", pestObservations);
         instance.setConfiguration(config);
+        //System.out.println(config.toJSON());
         List<Result> result = instance.getResult();
         /*for(Result res:result)
         {
-- 
GitLab