diff --git a/pom.xml b/pom.xml index faeefecbbe1f75e8b8e37344eda8e33b56e714be..fc3f246a055d71f13dafeb4da5c02bf87d7af16f 100755 --- a/pom.xml +++ b/pom.xml @@ -29,9 +29,18 @@ <url>https://nexus.bedatadriven.com/content/groups/public/</url> </repository> <repository> - <id>osgeo</id> - <name>OSGEO</name> - <url>https://download.osgeo.org/webdav/geotools/</url> + <id>osgeo</id> + <name>OSGeo Release Repository</name> + <url>https://repo.osgeo.org/repository/release/</url> + <snapshots><enabled>false</enabled></snapshots> + <releases><enabled>true</enabled></releases> + </repository> + <repository> + <id>osgeo-snapshot</id> + <name>OSGeo Snapshot Repository</name> + <url>https://repo.osgeo.org/repository/snapshot/</url> + <snapshots><enabled>true</enabled></snapshots> + <releases><enabled>false</enabled></releases> </repository> <repository> <id>unidata-releases</id> diff --git a/src/main/java/no/nibio/vips/logic/scheduling/model/preprocessor/BremiaLactucaeModelPreprocessor.java b/src/main/java/no/nibio/vips/logic/scheduling/model/preprocessor/BremiaLactucaeModelPreprocessor.java index 50092ba5691771c04600203fea5f1e3edc0f631e..3b7784b10b04b353250eaf3f25edfa901d818b19 100755 --- a/src/main/java/no/nibio/vips/logic/scheduling/model/preprocessor/BremiaLactucaeModelPreprocessor.java +++ b/src/main/java/no/nibio/vips/logic/scheduling/model/preprocessor/BremiaLactucaeModelPreprocessor.java @@ -67,7 +67,7 @@ public class BremiaLactucaeModelPreprocessor extends ModelRunPreprocessor { }, configuration.getDateStartInTimeZone(), configuration.getDateEndInTimeZone()); - observations = wUtil.checkForAndFixHourlyTimeSeriesHoles(observations); + observations = wUtil.checkForAndFixHourlyTimeSeriesHolesMultiParameter(observations); List<WeatherObservation> BTg = wUtil.filterWeatherObservationsByParameter(observations, new HashSet(Arrays.asList(WeatherElements.LEAF_WETNESS_DURATION_GROUND_LEVEL))); List<WeatherObservation> BT = wUtil.filterWeatherObservationsByParameter(observations, new HashSet(Arrays.asList(WeatherElements.LEAF_WETNESS_DURATION))); List<WeatherObservation> TX = wUtil.filterWeatherObservationsByParameter(observations, new HashSet(Arrays.asList(WeatherElements.TEMPERATURE_MAXIMUM))); diff --git a/src/main/java/no/nibio/vips/logic/scheduling/model/preprocessor/SeptoriaApiicolaModelPreprocessor.java b/src/main/java/no/nibio/vips/logic/scheduling/model/preprocessor/SeptoriaApiicolaModelPreprocessor.java index 8186262eacb50082c8bf81fc00f879a6acc84d3f..d034b5c31dd8b080983594f61b117c682ca3a61d 100755 --- a/src/main/java/no/nibio/vips/logic/scheduling/model/preprocessor/SeptoriaApiicolaModelPreprocessor.java +++ b/src/main/java/no/nibio/vips/logic/scheduling/model/preprocessor/SeptoriaApiicolaModelPreprocessor.java @@ -77,7 +77,7 @@ public class SeptoriaApiicolaModelPreprocessor extends ModelRunPreprocessor { }, configuration.getDateStartInTimeZone(), configuration.getDateEndInTimeZone()); - observations = wUtil.checkForAndFixHourlyTimeSeriesHoles(observations); + observations = wUtil.checkForAndFixHourlyTimeSeriesHolesMultiParameter(observations); List<WeatherObservation> BT = wUtil.filterWeatherObservationsByParameter(observations, new HashSet(Arrays.asList(WeatherElements.LEAF_WETNESS_DURATION))); List<WeatherObservation> TM = wUtil.filterWeatherObservationsByParameter(observations, new HashSet(Arrays.asList(WeatherElements.TEMPERATURE_MEAN))); List<WeatherObservation> RR = wUtil.filterWeatherObservationsByParameter(observations, new HashSet(Arrays.asList(WeatherElements.PRECIPITATION)));