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 c29d892fc17b1c2073f496374b664ebd29029e02..89a4f61bb21d04922e695f4c2a8082043bae3f73 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 b9f89c35862c956498d6a575bb98ad374dbd95ad..9b88fe87ef10ee28d67885535a6f35e96e78722f 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ø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 08082d847b992e63db1d7b4ac706a5c6ca91ae6d..a53545c6eb292474dee79b4685897399250246bc 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øistad, NIBIO)"}}\n<h2>Modellbeskrivelse</h2>\n<p>Modellen er basert på en enkel beregning av når værforholdene er fuktige nok til at soppen kan forårsake infeksjon i mottakelige vertplanter.</p>\n<p>Varsler om infeksjonsfare gis når det er registrert minimum 12 timer sammenhengende bladfuktighet. Fuktighetsperiodene beregnes fra registrert bladfuktighet 30 cm over bakken. Ved målestasjoner som ikke har sensor på bakkenivå brukes bladfuktighet målt ved 2 m.</p>\n<p>Modellen er utviklet i USA og publisert av Lacy (1994). </p>\n<p>Det antas at varslingsmodellen også vil være gyldig for persillebladflekk (Septoria petroselini).</p>\n<h2>Tolking av varsel</h2>\n<p>Dersom smitte er til stede kan det forventes å finne angrep 7-14 dager etter varsel om infeksjonsfare (gult eller rødt varsel). Det anbefales å intensivere feltinspeksjoner i etterkant av perioder med varsler.</p>\n<ul>\n<li>Grønne bokser betyr at det ikke er fare for infeksjon</li>\n<li>Gule bokser betyr at værforhold tilsier fare for infeksjon. Ingen registrerte angrep.</li>\n<li>Røde bokser betyr fare for infeksjon. Angrep av selleribladflekk er observert i område/region med tilknytning til gjeldende værstasjon. Observasjoner og registrering av selleribladflekk utføres i samarbeid med rådgivere i Norsk Landbruksrådgiving.</li>\n</ul>\n<p>Den grafiske presentasjonen viser blå søyler for perioder med minst 12 timer sammenhengende luftfuktighet. Svart søyle viser dato for observasjon av selleribladflekk.</p>\n<h2>Varslingssesong – oppstart og avslutning av varsel</h2>\n<p>Varsler startes ca 1. juni og avsluttes 30. september.</p>\n<p>Varsler beregnes ved værstasjoner i regioner med kommersiell produksjon av selleri.</p>\n<h2>Utprøving og validering av modellen</h2>\n<h3>Nasjonalt</h3>\n<p>Det arbeides med å validere denne varslingsmodellen under norske forhold. Det anbefales foreløpig å bruke modellen som hjelpemiddel for når en bør intensivere feltinspeksjoner.</p>\n<p>Detaljerte studier av værforhold, sporedanning og smitteforhold gjennomføres i feltforsøk på Ås i perioden 2012-2016. Resultater så langt viser at modellen treffer bra, men at det kan være behov for enkelte justeringer, spesielt i sammenheng med nedbørsperioder (Nordskog og Le, 2014). Eventuelle tilpasninger av modellen gjøres etter at valideringsforsø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> </p> statusInterpretation=<p>Grafen viser blå søyler for perioder med minst 12 timer sammenhengende luftfuktighet. Svart søyle viser dato for observasjon av selleribladflekk.</p>\n<p>Grønn, gul, rød bakgrunnsfarge samsvarer med daglig varselstatus i kartet på forsida og i tabellen under.</p>\n<ul>\n<li>Grønn boks: ingen fare for infeksjon</li>\n<li>Gul boks: værforhold tilsier at det er fare for infeksjon, ingen registrerte angrep.</li>\n<li>Rød boks: fare for infeksjon. Angrep av selleribladflekk er observert i område/region med tilknytning til gjeldende væ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 b2278db8dc1acb76a097c3d2443b10cc04e383f7..24e2c2fca3b0625984fe171acafce3e36e3fcba3 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) {