diff --git a/src/main/java/no/nibio/vips/core/config/JacksonConfig.java b/src/main/java/no/nibio/vips/core/config/JacksonConfig.java index db1aa091ab0a4d9b9be94d04d7a1ac20c6ccd285..3c0e5514c16641921cf8491295e521af62c3369d 100755 --- a/src/main/java/no/nibio/vips/core/config/JacksonConfig.java +++ b/src/main/java/no/nibio/vips/core/config/JacksonConfig.java @@ -47,7 +47,6 @@ public class JacksonConfig implements ContextResolver<ObjectMapper>{ { objectMapper = new ObjectMapper(); objectMapper.configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false); - objectMapper.registerModule(new JtsModule()); objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); objectMapper.registerModule(new JtsModule()); objectMapper.registerModule(new JavaTimeModule()); 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 f33c1c66244f5f4aaa964da4e1cdf46548126992..4b099ab7dfa8e6143bd3f73d3a0fbf7cc162e67b 100755 --- a/src/main/java/no/nibio/vips/core/service/ModelResourceImpl.java +++ b/src/main/java/no/nibio/vips/core/service/ModelResourceImpl.java @@ -316,13 +316,12 @@ public class ModelResourceImpl implements ModelResource{ { try { - DataTransformer dt = new DataTransformer(); - config.setConfigParameter("observations", dt.getVIPSWeatherData(config.getWeatherData())); - Model calledModel = ModelFactory.getInstance().getModelInstance(modelId); - calledModel.setConfiguration(config); - List<Result> results = calledModel.getResult(); - return Response.ok().entity(dt.getIPMDecisionsModelOutput(results)).build(); - + DataTransformer dt = new DataTransformer(); + config.setConfigParameter("observations", dt.getVIPSWeatherData(config.getWeatherData())); + Model calledModel = ModelFactory.getInstance().getModelInstance(modelId); + calledModel.setConfiguration(config); + List<Result> results = calledModel.getResult(); + return Response.ok().entity(dt.getIPMDecisionsModelOutput(results)).build(); } catch(Exception ex) {