From 1aefaa19a977e6a09cf6cbb9dea2349e88877eb6 Mon Sep 17 00:00:00 2001 From: Tor-Einar Skog <tor-einar.skog@nibio.no> Date: Fri, 8 Feb 2019 11:26:19 +0100 Subject: [PATCH] Documentation updates Bugfix: result timestamp for all results was end date of period. Fixed that --- .../vips/model/fallarmywormmodel/FallArmywormModel.java | 6 +++++- .../no/nibio/vips/model/fallarmywormmodel/texts.properties | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/no/nibio/vips/model/fallarmywormmodel/FallArmywormModel.java b/src/main/java/no/nibio/vips/model/fallarmywormmodel/FallArmywormModel.java index 7e32071..edbd32b 100644 --- a/src/main/java/no/nibio/vips/model/fallarmywormmodel/FallArmywormModel.java +++ b/src/main/java/no/nibio/vips/model/fallarmywormmodel/FallArmywormModel.java @@ -127,7 +127,7 @@ public class FallArmywormModel extends I18nImpl implements Model{ resultList.add(todaysResult); // Move on - today.add1Day(); + today = new XDate(today.getTomorrow()); } return resultList; } @@ -224,6 +224,10 @@ public class FallArmywormModel extends I18nImpl implements Model{ @Override public String getSampleConfig() { return "{\n" + + " \"loginInfo\":{\n" + + " \"username\":\"example\",\n" + + " \"password\":\"example\"\n" + + " },\n" + " \"modelId\": \"FAWMODEL01\",\n" + " \"configParameters\": {\n" + " \"longitude\": \"12.4885772\",\n" + diff --git a/src/main/resources/no/nibio/vips/model/fallarmywormmodel/texts.properties b/src/main/resources/no/nibio/vips/model/fallarmywormmodel/texts.properties index d1e1def..9169ae1 100644 --- a/src/main/resources/no/nibio/vips/model/fallarmywormmodel/texts.properties +++ b/src/main/resources/no/nibio/vips/model/fallarmywormmodel/texts.properties @@ -17,5 +17,5 @@ name=Fall Armyworm Model usage=TODO -description={{filename="/images/FAMEWS-VIPS_integration.png" description="The app sends observations to the FAMEWS server. It sends field specific info to VIPS. The VIPS FAW model pulls observation data from the FAMEWS server, calculates risk and returns it to the farmers FAMEWS app"}}\n<p>(Update: 2019-02-08)</p>\n<p>A simple infection risk assessment algorithm for Fall Armyworm (<em>Spodoptera frugiperda</em>) in Africa. Currently, it takes into account:</p>\n<ul>\n<li>The <strong>number of days since you planted</strong>. This decides if you have plant growth above ground or not. Before you have that, there’s no risk.</li>\n<li>If you are <strong>intercropping</strong>, and in case with what. Intercropping reduces the assessed risk, varying with what you intercrop with</li>\n<li>Recent <strong>FAW observations</strong> near you. Currently, observations within a 10 km radius of your field indicate a high risk, whereas observations 10-25 km away indicate some risk.</li>\n</ul>\n<p>Weather data, more specifically favourable temperature range for FAW, has been considered, but we’re not using that at the moment</p>\n<p>The farmer’s phone can be either be <em>offline</em> or <em>online</em>. We assume that the farmer is online approximately once per day. So once per day, if the phone is online, data are transmitted as described in Illustration 1. If the warning status (NO RISK/LOW RISK/HIGH RISK) calculated by the VIPS algorithm changes from one day to another, the FAMEWS app alerts the farmer to do something.</p>\n<p>The VIPS algorithm has been written using JavaScript, with a Java wrapper around it. This enables it to be deployed both on a server and directly on an Android phone (both on native Android apps and on apps like FAMEWS that are developed in HTML/JavaScript). The current approach is to deploy it on the VIPS server, to minimize the complexities of requests having to be made by the app, and also to be able to refine the algorithm without requiring the farmer to update the FAMEWS app frequently.</p>\n<p>Read more about FAOs work on Fall Armyworm here: <a href="http://www.fao.org/fall-armyworm/en/" target="_blank" rel="noopener">http://www.fao.org/fall-armyworm/en/</a></p>\n<p>Authors: Keith Cressmann (FAO/AGP), David Hughes (FAO/AGP), Tor-Einar Skog (NIBIO)</p> +description=<p>{{filename="/images/FAMEWS-VIPS_integration.png" description="The app sends observations to the FAMEWS server. It sends field specific info to VIPS. The VIPS FAW model pulls observation data from the FAMEWS server, calculates risk and returns it to the farmers FAMEWS app"}}</p>\n<p>(Update: 2019-02-08)</p>\n<p>A simple infection risk assessment algorithm for Fall Armyworm (<em>Spodoptera frugiperda</em>) in Africa. Currently, it takes into account:</p>\n<ul>\n<li>The <strong>number of days since you planted</strong>. This decides if you have plant growth above ground or not. Before you have that, there’s no risk.</li>\n<li>If you are <strong>intercropping</strong>, and in case with what. Intercropping reduces the assessed risk, varying with what you intercrop with</li>\n<li>Recent <strong>FAW observations</strong> near you. Currently, observations within a 10 km radius of your field indicate a high risk, whereas observations 10-25 km away indicate some risk.</li>\n</ul>\n<p>Weather data, more specifically favourable temperature range for FAW, has been considered, but we’re not using that at the moment</p>\n<p>The farmer’s phone can be either be <em>offline</em> or <em>online</em>. We assume that the farmer is online approximately once per day. So once per day, if the phone is online, data are transmitted as described in Illustration 1. If the warning status (NO RISK/LOW RISK/HIGH RISK) calculated by the VIPS algorithm changes from one day to another, the FAMEWS app alerts the farmer to do something.</p>\n<p>The VIPS algorithm has been written using JavaScript, with a Java wrapper around it. This enables it to be deployed both on a server and directly on an Android phone (both on native Android apps and on apps like FAMEWS that are developed in HTML/JavaScript). The current approach is to deploy it on the VIPS server, to minimize the complexities of requests having to be made by the app, and also to be able to refine the algorithm without requiring the farmer to update the FAMEWS app frequently.</p>\n<p>Read more about FAOs work on Fall Armyworm here: <a href="http://www.fao.org/fall-armyworm/en/" target="_blank" rel="noopener">http://www.fao.org/fall-armyworm/en/</a></p>\n<p>Authors: Keith Cressman (FAO/AGP), David Hughes (FAO/AGP), Tor-Einar Skog (NIBIO)</p>\n<p style="font-size: small;"><em>This work was supported by Norwegian Agency for Development Cooperation (The Donor), the Section for research, innovation and higher education grant number GCP/INT/928/MUL</em></p> statusInterpretation=<ul>\n<li>Red: High risk of Fall Armyworm infection</li>\n<li>Yellow: Low/medium risk of Fall Armyworm infection</li>\n<li>Green: No risk</li>\n<li>Blue: Missing data</li>\n<li>Grey: No models running</li>\n</ul> -- GitLab