From 77156813b375f63877cc39c83ad06b780a9cf502 Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@nibio.no>
Date: Tue, 1 Dec 2020 09:25:29 +0100
Subject: [PATCH] Bugfix: Handling models without field observations
---
.../nibio/vips/core/service/ModelResourceImpl.java | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/main/java/no/nibio/vips/core/service/ModelResourceImpl.java b/src/main/java/no/nibio/vips/core/service/ModelResourceImpl.java
index 0ab9b98..aa37372 100755
--- a/src/main/java/no/nibio/vips/core/service/ModelResourceImpl.java
+++ b/src/main/java/no/nibio/vips/core/service/ModelResourceImpl.java
@@ -320,11 +320,14 @@ public class ModelResourceImpl implements ModelResource{
{
config.setConfigParameter("observations", dt.getVIPSWeatherData(config.getWeatherData()));
}
- config.setConfigParameter("pestObservations", dt.getVIPSPestObservations(
- (List) config.getConfigParameter("fieldObservations"),
- (List) config.getConfigParameter("fieldObservationQuantifications")
- )
- );
+ if(config.getConfigParameter("fieldObservations") != null)
+ {
+ config.setConfigParameter("pestObservations", dt.getVIPSPestObservations(
+ (List) config.getConfigParameter("fieldObservations"),
+ (List) config.getConfigParameter("fieldObservationQuantifications")
+ )
+ );
+ }
Model calledModel = ModelFactory.getInstance().getModelInstance(modelId);
calledModel.setConfiguration(config);
List<Result> results = calledModel.getResult();
--
GitLab