diff --git a/pom.xml b/pom.xml index c746e5185bd580800423d3a82260597b1e3483f1..fca6f850814bf5ed66aa049ab62152794867e153 100755 --- a/pom.xml +++ b/pom.xml @@ -256,6 +256,11 @@ <artifactId>enunciate-rt-util</artifactId> <version>2.10.1</version> </dependency> + <dependency> + <groupId>com.bedatadriven</groupId> + <artifactId>jackson-datatype-jts</artifactId> + <version>2.2</version> + </dependency> </dependencies> <build> diff --git a/src/main/java/no/nibio/vips/logic/modules/roughage/RoughageService.java b/src/main/java/no/nibio/vips/logic/modules/roughage/RoughageService.java index 81c5f25395435568cb47c61ccc35bec8f562eb8d..cfe05d635f1d1905a2e17de9ada75aefcbefc266 100755 --- a/src/main/java/no/nibio/vips/logic/modules/roughage/RoughageService.java +++ b/src/main/java/no/nibio/vips/logic/modules/roughage/RoughageService.java @@ -207,7 +207,8 @@ public class RoughageService { TMel, firstLongTermForecastTime, dateOfLastWeatherData, - timeZone + timeZone, + false ); Collections.sort(TMLongTime); TMLongTime = wUtil.fillHourlyHolesBruteForce(TMLongTime, WeatherUtil.AGGREGATION_TYPE_AVERAGE, firstLongTermForecastTime, dateOfLastWeatherData); @@ -232,7 +233,8 @@ public class RoughageService { RRel, firstLongTermForecastTime, dateOfLastWeatherData, - timeZone + timeZone, + false ); RRLongTime = wUtil.fillHourlyHolesBruteForce(RRLongTime, WeatherUtil.AGGREGATION_TYPE_SUM, firstLongTermForecastTime, dateOfLastWeatherData); diff --git a/src/main/java/no/nibio/vips/logic/service/JacksonConfig.java b/src/main/java/no/nibio/vips/logic/service/JacksonConfig.java index 7c60b5001e97a16d55151814e771b6664adb0bfd..4cf59885b06eb8b397758bcc0bbdab3983ca3896 100755 --- a/src/main/java/no/nibio/vips/logic/service/JacksonConfig.java +++ b/src/main/java/no/nibio/vips/logic/service/JacksonConfig.java @@ -19,18 +19,24 @@ package no.nibio.vips.logic.service; +import com.bedatadriven.jackson.datatype.jts.JtsModule; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; +import javax.ws.rs.Consumes; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; import javax.ws.rs.ext.ContextResolver; import javax.ws.rs.ext.Provider; /** * Add this to no.nibio.vips.logic.VIPSLogicApplication if you want all * dates to be serialized as ISO formatted date strings - * @copyright 2015 <a href="http://www.nibio.no/">NIBIO</a> + * @copyright 2018 <a href="http://www.nibio.no/">NIBIO</a> * @author Tor-Einar Skog <tor-einar.skog@nibio.no> */ @Provider +@Produces(MediaType.APPLICATION_JSON) +@Consumes(MediaType.APPLICATION_JSON) public class JacksonConfig implements ContextResolver<ObjectMapper> { private final ObjectMapper objectMapper; @@ -39,6 +45,7 @@ public class JacksonConfig implements ContextResolver<ObjectMapper> { objectMapper = new ObjectMapper().configure( SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false); + objectMapper.registerModule(new JtsModule()); } @Override