diff --git a/pom.xml b/pom.xml
index 3f6c29a624e940924c5011b24c905856a1387151..7ee404c21b1762e02ef63182458ad6dffa550c49 100755
--- a/pom.xml
+++ b/pom.xml
@@ -243,6 +243,7 @@
</vmArgs>
<wsdlLocation>https://dmiweatherservice-plant.dlbr.dk/DMIWeatherService.svc?wsdl</wsdlLocation>
<staleFile>${project.build.directory}/jaxws/stale/DMIWeatherService.svc.stale</staleFile>
+ <keep>true</keep>
</configuration>
<id>wsimport-generate-DMIWeatherService.svc</id>
<phase>generate-sources</phase>
diff --git a/src/jax-ws-catalog.xml b/src/jax-ws-catalog.xml
index 3b96ec165ccb1c9c94472dfcc6e604c21774a011..c074fd31684adeb88bef92ad56e99be552150899 100644
--- a/src/jax-ws-catalog.xml
+++ b/src/jax-ws-catalog.xml
@@ -1,9 +1,11 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog" prefer="system">
+ <system systemId="https://dmiweatherservice-plant.dlbr.dk/DMIWeatherService.svc" uri="wsdl/dmiweatherservice-plant.dlbr.dk/DMIWeatherService.svc.xml"/>
<system systemId="https://dmiweatherservice-plant.dlbr.dk/DMIWeatherService.svc?wsdl" uri="wsdl/dmiweatherservice-plant.dlbr.dk/DMIWeatherService.svc.wsdl"/>
<system systemId="https://dmiweatherservice-plant.dlbr.dk/DMIWeatherService.svc?xsd=xsd0" uri="wsdl/dmiweatherservice-plant.dlbr.dk/DMIWeatherService.svc.xsd_xsd0.xsd"/>
<system systemId="https://dmiweatherservice-plant.dlbr.dk/DMIWeatherService.svc?xsd=xsd1" uri="wsdl/dmiweatherservice-plant.dlbr.dk/DMIWeatherService.svc.xsd_xsd1.xsd"/>
<system systemId="https://dmiweatherservice-plant.dlbr.dk/DMIWeatherService.svc?xsd=xsd2" uri="wsdl/dmiweatherservice-plant.dlbr.dk/DMIWeatherService.svc.xsd_xsd2.xsd"/>
<system systemId="https://dmiweatherservice-plant.dlbr.dk/DMIWeatherService.svc?xsd=xsd3" uri="wsdl/dmiweatherservice-plant.dlbr.dk/DMIWeatherService.svc.xsd_xsd3.xsd"/>
<system systemId="https://dmiweatherservice-plant.dlbr.dk/DMIWeatherService.svc?xsd=xsd4" uri="wsdl/dmiweatherservice-plant.dlbr.dk/DMIWeatherService.svc.xsd_xsd4.xsd"/>
+ <system systemId="https://dmiweatherservice-plant.dlbr.dk/DMIWeatherService.svc?singleWsdl" uri="wsdl/dmiweatherservice-plant.dlbr.dk/DMIWeatherService.svc.singlewsdl.wsdl"/>
</catalog>
\ No newline at end of file
diff --git a/src/main/java/no/nibio/vips/logic/scheduling/model/preprocessor/NaerstadModelPreprocessor.java b/src/main/java/no/nibio/vips/logic/scheduling/model/preprocessor/NaerstadModelPreprocessor.java
index c15bf67eaa775bf5a5d38c5c9e6ab48c11f8925e..b5e3633d56aa620bd3ed65ba2548b625e2d31770 100755
--- a/src/main/java/no/nibio/vips/logic/scheduling/model/preprocessor/NaerstadModelPreprocessor.java
+++ b/src/main/java/no/nibio/vips/logic/scheduling/model/preprocessor/NaerstadModelPreprocessor.java
@@ -24,7 +24,6 @@ import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Collections;
import java.util.Date;
import java.util.HashSet;
import java.util.List;
@@ -85,7 +84,7 @@ public class NaerstadModelPreprocessor extends ModelRunPreprocessor{
try {
observations = wdsUtil.getWeatherObservations(
- weatherStation.getDataFetchUri(),
+ weatherStation,
WeatherObservation.LOG_INTERVAL_ID_1H,
new String[]{
WeatherElements.TEMPERATURE_MEAN,
@@ -96,8 +95,7 @@ public class NaerstadModelPreprocessor extends ModelRunPreprocessor{
WeatherElements.WIND_SPEED_2M
},
configuration.getDateStartInTimeZone(),
- dateEndWeatherData,
- timeZone);
+ dateEndWeatherData);
observations = validateAndSanitizeObservations(observations, configuration.getDateStartInTimeZone());
//System.out.println(configuration.getDateStartInTimeZone());
} catch (ConfigValidationException | WeatherObservationListException | WeatherDataSourceException ex) {
@@ -271,5 +269,4 @@ public class NaerstadModelPreprocessor extends ModelRunPreprocessor{
retVal = wUtil.truncateToLastCommonObservation(retVal);
return retVal;
}
-
}
diff --git a/src/main/java/no/nibio/vips/util/weather/dnmipointweb/DMIPointWebDataParser.java b/src/main/java/no/nibio/vips/util/weather/dnmipointweb/DMIPointWebDataParser.java
index eea1b7c68bf1a0547bb1eba1951449240c8ca926..cf704d3132e63304eab0fa11118495f0687cd23d 100644
--- a/src/main/java/no/nibio/vips/util/weather/dnmipointweb/DMIPointWebDataParser.java
+++ b/src/main/java/no/nibio/vips/util/weather/dnmipointweb/DMIPointWebDataParser.java
@@ -58,7 +58,7 @@ public class DMIPointWebDataParser {
List<WeatherObservation> retVal = new ArrayList<>();
try {
IWeatherService proxy = new WeatherService().getSslOffloadedBasicHttpBindingIWeatherService();
- ArrayOfWeatherDataSource wdsource = new ArrayOfWeatherDataSource();
+ UseableArrayOfWeatherDataSource wdsource = new UseableArrayOfWeatherDataSource();
wdsource.add(WeatherDataSource.OBS);
wdsource.add(WeatherDataSource.FORECAST);
wdsource.add(WeatherDataSource.NORMAL);
@@ -74,7 +74,7 @@ public class DMIPointWebDataParser {
}
- ArrayOfWeatherDataParameter wdparam = new ArrayOfWeatherDataParameter();
+ UseableArrayOfWeatherDataParameter wdparam = new UseableArrayOfWeatherDataParameter();
DMIPointWebDataParser.PARAM_MAP.values().stream().forEach(
listedParam -> wdparam.add(listedParam)
);
diff --git a/src/main/java/no/nibio/vips/util/weather/dnmipointweb/UseableArrayOfWeatherDataParameter.java b/src/main/java/no/nibio/vips/util/weather/dnmipointweb/UseableArrayOfWeatherDataParameter.java
new file mode 100644
index 0000000000000000000000000000000000000000..0cdc7e3ca656988406c83b982b2bdf3dca8c37ee
--- /dev/null
+++ b/src/main/java/no/nibio/vips/util/weather/dnmipointweb/UseableArrayOfWeatherDataParameter.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2017 NIBIO <http://www.nibio.no/>.
+ *
+ * This file is part of VIPSLogic.
+ * VIPSLogic is free software: you can redistribute it and/or modify
+ * it under the terms of the NIBIO Open Source License as published by
+ * NIBIO, either version 1 of the License, or (at your option) any
+ * later version.
+ *
+ * VIPSLogic is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * NIBIO Open Source License for more details.
+ *
+ * You should have received a copy of the NIBIO Open Source License
+ * along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>.
+ *
+ */
+
+package no.nibio.vips.util.weather.dnmipointweb;
+
+/**
+ * @copyright 2017 <a href="http://www.nibio.no/">NIBIO</a>
+ * @author Tor-Einar Skog <tor-einar.skog@nibio.no>
+ */
+public class UseableArrayOfWeatherDataParameter extends ArrayOfWeatherDataParameter{
+
+ public void add(WeatherDataParameter wdp)
+ {
+ this.getWeatherDataParameter().add(wdp);
+ }
+
+}
diff --git a/src/main/java/no/nibio/vips/util/weather/dnmipointweb/UseableArrayOfWeatherDataSource.java b/src/main/java/no/nibio/vips/util/weather/dnmipointweb/UseableArrayOfWeatherDataSource.java
new file mode 100644
index 0000000000000000000000000000000000000000..124e800e57bff14792f336a2789b00918b674776
--- /dev/null
+++ b/src/main/java/no/nibio/vips/util/weather/dnmipointweb/UseableArrayOfWeatherDataSource.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2017 NIBIO <http://www.nibio.no/>.
+ *
+ * This file is part of VIPSLogic.
+ * VIPSLogic is free software: you can redistribute it and/or modify
+ * it under the terms of the NIBIO Open Source License as published by
+ * NIBIO, either version 1 of the License, or (at your option) any
+ * later version.
+ *
+ * VIPSLogic is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * NIBIO Open Source License for more details.
+ *
+ * You should have received a copy of the NIBIO Open Source License
+ * along with VIPSLogic. If not, see <http://www.nibio.no/licenses/>.
+ *
+ */
+
+package no.nibio.vips.util.weather.dnmipointweb;
+
+/**
+ * @copyright 2017 <a href="http://www.nibio.no/">NIBIO</a>
+ * @author Tor-Einar Skog <tor-einar.skog@nibio.no>
+ */
+public class UseableArrayOfWeatherDataSource extends ArrayOfWeatherDataSource{
+
+ public void add(WeatherDataSource wds)
+ {
+ this.getWeatherDataSource().add(wds);
+ }
+}
diff --git a/src/test/java/no/nibio/vips/util/weather/dnmipointweb/DMIPointWebDataParserTest.java b/src/test/java/no/nibio/vips/util/weather/dnmipointweb/DMIPointWebDataParserTest.java
index 24330246af9c701b1a597d3d87d15451a9d76412..10d9b489ce10e8f6786d1b18caab3cc094c57607 100644
--- a/src/test/java/no/nibio/vips/util/weather/dnmipointweb/DMIPointWebDataParserTest.java
+++ b/src/test/java/no/nibio/vips/util/weather/dnmipointweb/DMIPointWebDataParserTest.java
@@ -70,9 +70,7 @@ public class DMIPointWebDataParserTest {
Double longitude = 10.0213;
Double latitude = 56.0199;
List<WeatherObservation> result = instance.getData(longitude, latitude, dateFrom, dateTo);
- result.stream().forEach(r->System.out.println(r.toString()));
- // TODO review the generated test code and remove the default call to fail.
- fail("The test case is a prototype.");
+ result.stream().forEach(r->System.out.println(r.toString()));
}
}
diff --git a/src/wsdl/dmiweatherservice-plant.dlbr.dk/DMIWeatherService.svc.singlewsdl.wsdl b/src/wsdl/dmiweatherservice-plant.dlbr.dk/DMIWeatherService.svc.singlewsdl.wsdl
new file mode 100644
index 0000000000000000000000000000000000000000..a1a5e09d69cde183d914b2ad72abf86d9e0be893
--- /dev/null
+++ b/src/wsdl/dmiweatherservice-plant.dlbr.dk/DMIWeatherService.svc.singlewsdl.wsdl
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="utf-8"?><wsdl:definitions name="WeatherService" targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" xmlns:wsx="http://schemas.xmlsoap.org/ws/2004/09/mex" xmlns:wsap="http://schemas.xmlsoap.org/ws/2004/08/addressing/policy" xmlns:msc="http://schemas.microsoft.com/ws/2005/12/wsdl/contract" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:tns="http://tempuri.org/" xmlns:wsa10="http://www.w3.org/2005/08/addressing" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing"><wsdl:types><xs:schema elementFormDefault="qualified" targetNamespace="http://tempuri.org/" xmlns:xs="http://www.w3.org/2001/XMLSchema"><xs:import namespace="http://schemas.datacontract.org/2004/07/DMIWeatherService.DataContract"/><xs:element name="GetWeatherData"><xs:complexType><xs:sequence><xs:element minOccurs="0" name="X_Coordinate" nillable="true" type="xs:string"/><xs:element minOccurs="0" name="Y_Coordinate" nillable="true" type="xs:string"/><xs:element minOccurs="0" name="isUTM" type="xs:boolean"/><xs:element minOccurs="0" name="UTMZone" nillable="true" type="xs:string"/><xs:element minOccurs="0" name="interval" type="q1:WeatherInterval" xmlns:q1="http://schemas.datacontract.org/2004/07/DMIWeatherService.DataContract"/><xs:element minOccurs="0" name="sources" nillable="true" type="q2:ArrayOfWeatherDataSource" xmlns:q2="http://schemas.datacontract.org/2004/07/DMIWeatherService.DataContract"/><xs:element minOccurs="0" name="DateFrom" type="xs:dateTime"/><xs:element minOccurs="0" name="DateTo" type="xs:dateTime"/><xs:element minOccurs="0" name="weatherDataParameters" nillable="true" type="q3:ArrayOfWeatherDataParameter" xmlns:q3="http://schemas.datacontract.org/2004/07/DMIWeatherService.DataContract"/><xs:element minOccurs="0" name="baseTempValue" type="xs:double"/><xs:element minOccurs="0" name="includeTempSum" type="xs:boolean"/></xs:sequence></xs:complexType></xs:element><xs:element name="GetWeatherDataResponse"><xs:complexType><xs:sequence><xs:element minOccurs="0" name="GetWeatherDataResult" nillable="true" type="q4:WeatherResponse" xmlns:q4="http://schemas.datacontract.org/2004/07/DMIWeatherService.DataContract"/></xs:sequence></xs:complexType></xs:element><xs:element name="GetWeatherDataExtended"><xs:complexType><xs:sequence><xs:element minOccurs="0" name="X_Coordinate" nillable="true" type="xs:string"/><xs:element minOccurs="0" name="Y_Coordinate" nillable="true" type="xs:string"/><xs:element minOccurs="0" name="isUTM" type="xs:boolean"/><xs:element minOccurs="0" name="UTMZone" nillable="true" type="xs:string"/><xs:element minOccurs="0" name="interval" type="q5:WeatherInterval" xmlns:q5="http://schemas.datacontract.org/2004/07/DMIWeatherService.DataContract"/><xs:element minOccurs="0" name="sources" nillable="true" type="q6:ArrayOfWeatherDataSource" xmlns:q6="http://schemas.datacontract.org/2004/07/DMIWeatherService.DataContract"/><xs:element minOccurs="0" name="DateFrom" type="xs:dateTime"/><xs:element minOccurs="0" name="DateTo" type="xs:dateTime"/><xs:element minOccurs="0" name="weatherDataParameters" nillable="true" type="q7:ArrayOfWeatherDataParameter" xmlns:q7="http://schemas.datacontract.org/2004/07/DMIWeatherService.DataContract"/><xs:element minOccurs="0" name="baseTempValue" type="xs:double"/><xs:element minOccurs="0" name="includeTempSum" type="xs:boolean"/><xs:element minOccurs="0" name="getExtendedEndDate" type="xs:boolean"/></xs:sequence></xs:complexType></xs:element><xs:element name="GetWeatherDataExtendedResponse"><xs:complexType><xs:sequence><xs:element minOccurs="0" name="GetWeatherDataExtendedResult" nillable="true" type="q8:WeatherResponse" xmlns:q8="http://schemas.datacontract.org/2004/07/DMIWeatherService.DataContract"/></xs:sequence></xs:complexType></xs:element><xs:element name="GetWeatherDataMultipoint"><xs:complexType><xs:sequence><xs:element minOccurs="0" name="xCoordinate" nillable="true" type="xs:string"/><xs:element minOccurs="0" name="yCoordinate" nillable="true" type="xs:string"/><xs:element minOccurs="0" name="isUTM" type="xs:boolean"/><xs:element minOccurs="0" name="utmZone" nillable="true" type="xs:string"/><xs:element minOccurs="0" name="interval" type="q9:WeatherInterval" xmlns:q9="http://schemas.datacontract.org/2004/07/DMIWeatherService.DataContract"/><xs:element minOccurs="0" name="sources" nillable="true" type="q10:ArrayOfWeatherDataSource" xmlns:q10="http://schemas.datacontract.org/2004/07/DMIWeatherService.DataContract"/><xs:element minOccurs="0" name="dateFrom" type="xs:dateTime"/><xs:element minOccurs="0" name="dateTo" type="xs:dateTime"/><xs:element minOccurs="0" name="weatherDataParameters" nillable="true" type="q11:ArrayOfWeatherDataParameter" xmlns:q11="http://schemas.datacontract.org/2004/07/DMIWeatherService.DataContract"/><xs:element minOccurs="0" name="baseTempValue" type="xs:double"/><xs:element minOccurs="0" name="includeTempSum" type="xs:boolean"/></xs:sequence></xs:complexType></xs:element><xs:element name="GetWeatherDataMultipointResponse"><xs:complexType><xs:sequence><xs:element minOccurs="0" name="GetWeatherDataMultipointResult" nillable="true" type="q12:ArrayOfExtendedWeatherResponse" xmlns:q12="http://schemas.datacontract.org/2004/07/DMIWeatherService.DataContract"/></xs:sequence></xs:complexType></xs:element><xs:element name="GetWeatherDataMultipointExtended"><xs:complexType><xs:sequence><xs:element minOccurs="0" name="xCoordinate" nillable="true" type="xs:string"/><xs:element minOccurs="0" name="yCoordinate" nillable="true" type="xs:string"/><xs:element minOccurs="0" name="isUTM" type="xs:boolean"/><xs:element minOccurs="0" name="utmZone" nillable="true" type="xs:string"/><xs:element minOccurs="0" name="interval" type="q13:WeatherInterval" xmlns:q13="http://schemas.datacontract.org/2004/07/DMIWeatherService.DataContract"/><xs:element minOccurs="0" name="sources" nillable="true" type="q14:ArrayOfWeatherDataSource" xmlns:q14="http://schemas.datacontract.org/2004/07/DMIWeatherService.DataContract"/><xs:element minOccurs="0" name="dateFrom" type="xs:dateTime"/><xs:element minOccurs="0" name="dateTo" type="xs:dateTime"/><xs:element minOccurs="0" name="weatherDataParameters" nillable="true" type="q15:ArrayOfWeatherDataParameter" xmlns:q15="http://schemas.datacontract.org/2004/07/DMIWeatherService.DataContract"/><xs:element minOccurs="0" name="baseTempValue" type="xs:double"/><xs:element minOccurs="0" name="includeTempSum" type="xs:boolean"/><xs:element minOccurs="0" name="getExtendedEndDate" type="xs:boolean"/></xs:sequence></xs:complexType></xs:element><xs:element name="GetWeatherDataMultipointExtendedResponse"><xs:complexType><xs:sequence><xs:element minOccurs="0" name="GetWeatherDataMultipointExtendedResult" nillable="true" type="q16:ArrayOfExtendedWeatherResponse" xmlns:q16="http://schemas.datacontract.org/2004/07/DMIWeatherService.DataContract"/></xs:sequence></xs:complexType></xs:element></xs:schema><xs:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://schemas.microsoft.com/2003/10/Serialization/" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://schemas.microsoft.com/2003/10/Serialization/"><xs:element name="anyType" nillable="true" type="xs:anyType"/><xs:element name="anyURI" nillable="true" type="xs:anyURI"/><xs:element name="base64Binary" nillable="true" type="xs:base64Binary"/><xs:element name="boolean" nillable="true" type="xs:boolean"/><xs:element name="byte" nillable="true" type="xs:byte"/><xs:element name="dateTime" nillable="true" type="xs:dateTime"/><xs:element name="decimal" nillable="true" type="xs:decimal"/><xs:element name="double" nillable="true" type="xs:double"/><xs:element name="float" nillable="true" type="xs:float"/><xs:element name="int" nillable="true" type="xs:int"/><xs:element name="long" nillable="true" type="xs:long"/><xs:element name="QName" nillable="true" type="xs:QName"/><xs:element name="short" nillable="true" type="xs:short"/><xs:element name="string" nillable="true" type="xs:string"/><xs:element name="unsignedByte" nillable="true" type="xs:unsignedByte"/><xs:element name="unsignedInt" nillable="true" type="xs:unsignedInt"/><xs:element name="unsignedLong" nillable="true" type="xs:unsignedLong"/><xs:element name="unsignedShort" nillable="true" type="xs:unsignedShort"/><xs:element name="char" nillable="true" type="tns:char"/><xs:simpleType name="char"><xs:restriction base="xs:int"/></xs:simpleType><xs:element name="duration" nillable="true" type="tns:duration"/><xs:simpleType name="duration"><xs:restriction base="xs:duration"><xs:pattern value="\-?P(\d*D)?(T(\d*H)?(\d*M)?(\d*(\.\d*)?S)?)?"/><xs:minInclusive value="-P10675199DT2H48M5.4775808S"/><xs:maxInclusive value="P10675199DT2H48M5.4775807S"/></xs:restriction></xs:simpleType><xs:element name="guid" nillable="true" type="tns:guid"/><xs:simpleType name="guid"><xs:restriction base="xs:string"><xs:pattern value="[\da-fA-F]{8}-[\da-fA-F]{4}-[\da-fA-F]{4}-[\da-fA-F]{4}-[\da-fA-F]{12}"/></xs:restriction></xs:simpleType><xs:attribute name="FactoryType" type="xs:QName"/><xs:attribute name="Id" type="xs:ID"/><xs:attribute name="Ref" type="xs:IDREF"/></xs:schema><xs:schema elementFormDefault="qualified" targetNamespace="http://schemas.datacontract.org/2004/07/DMIWeatherService.DataContract" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://schemas.datacontract.org/2004/07/DMIWeatherService.DataContract"><xs:import namespace="http://schemas.datacontract.org/2004/07/System"/><xs:import namespace="http://schemas.microsoft.com/2003/10/Serialization/Arrays"/><xs:simpleType name="WeatherInterval"><xs:restriction base="xs:string"><xs:enumeration value="day"/><xs:enumeration value="hour"/></xs:restriction></xs:simpleType><xs:element name="WeatherInterval" nillable="true" type="tns:WeatherInterval"/><xs:complexType name="ArrayOfWeatherDataSource"><xs:sequence><xs:element minOccurs="0" maxOccurs="unbounded" name="WeatherDataSource" type="tns:WeatherDataSource"/></xs:sequence></xs:complexType><xs:element name="ArrayOfWeatherDataSource" nillable="true" type="tns:ArrayOfWeatherDataSource"/><xs:simpleType name="WeatherDataSource"><xs:restriction base="xs:string"><xs:enumeration value="obs"/><xs:enumeration value="forecast"/><xs:enumeration value="normal"/><xs:enumeration value="auto"/><xs:enumeration value="partly_constructed"/><xs:enumeration value="constructed_case1"/><xs:enumeration value="constructed_case2"/><xs:enumeration value="constructed_case3"/><xs:enumeration value="obs_forecast"/></xs:restriction></xs:simpleType><xs:element name="WeatherDataSource" nillable="true" type="tns:WeatherDataSource"/><xs:complexType name="ArrayOfWeatherDataParameter"><xs:sequence><xs:element minOccurs="0" maxOccurs="unbounded" name="WeatherDataParameter" type="tns:WeatherDataParameter"/></xs:sequence></xs:complexType><xs:element name="ArrayOfWeatherDataParameter" nillable="true" type="tns:ArrayOfWeatherDataParameter"/><xs:simpleType name="WeatherDataParameter"><xs:restriction base="xs:string"><xs:enumeration value="airtemp"/><xs:enumeration value="glorad"/><xs:enumeration value="evapo"/><xs:enumeration value="mintemp"/><xs:enumeration value="maxtemp"/><xs:enumeration value="soiltemp"/><xs:enumeration value="airrh"/><xs:enumeration value="prec"/><xs:enumeration value="sunrad"/><xs:enumeration value="windspeed"/><xs:enumeration value="winddir"/><xs:enumeration value="leafwet"/><xs:enumeration value="precNoCor"/><xs:enumeration value="airtemp_special"/><xs:enumeration value="prec_special"/><xs:enumeration value="difrad_special"/><xs:enumeration value="glorad_special"/><xs:enumeration value="windspeed_special"/><xs:enumeration value="winddir_special"/><xs:enumeration value="leafwet_special"/><xs:enumeration value="airrh_special"/></xs:restriction></xs:simpleType><xs:element name="WeatherDataParameter" nillable="true" type="tns:WeatherDataParameter"/><xs:complexType name="WeatherResponse"><xs:sequence><xs:element minOccurs="0" name="WeahterDataList" nillable="true" type="tns:ArrayOfWeatherDataModel"/><xs:element minOccurs="0" name="WeatherError" nillable="true" type="tns:WeatherErrorModel"/><xs:element minOccurs="0" name="HasError" type="xs:boolean"/></xs:sequence></xs:complexType><xs:element name="WeatherResponse" nillable="true" type="tns:WeatherResponse"/><xs:complexType name="ArrayOfWeatherDataModel"><xs:sequence><xs:element minOccurs="0" maxOccurs="unbounded" name="WeatherDataModel" nillable="true" type="tns:WeatherDataModel"/></xs:sequence></xs:complexType><xs:element name="ArrayOfWeatherDataModel" nillable="true" type="tns:ArrayOfWeatherDataModel"/><xs:complexType name="WeatherDataModel"><xs:sequence><xs:element minOccurs="0" name="Airtemp" nillable="true" type="xs:double"/><xs:element minOccurs="0" name="Glorad" nillable="true" type="xs:double"/><xs:element minOccurs="0" name="Evapo" nillable="true" type="xs:double"/><xs:element minOccurs="0" name="Mintemp" nillable="true" type="xs:double"/><xs:element minOccurs="0" name="Maxtemp" nillable="true" type="xs:double"/><xs:element minOccurs="0" name="Soiltemp" nillable="true" type="xs:double"/><xs:element minOccurs="0" name="Airrh" nillable="true" type="xs:double"/><xs:element minOccurs="0" name="Prec" nillable="true" type="xs:double"/><xs:element minOccurs="0" name="Sunrad" nillable="true" type="xs:double"/><xs:element minOccurs="0" name="Windspeed" nillable="true" type="xs:double"/><xs:element minOccurs="0" name="Winddir" nillable="true" type="xs:double"/><xs:element minOccurs="0" name="Leafwet" nillable="true" type="xs:double"/><xs:element minOccurs="0" name="AirtempSum" nillable="true" type="xs:double"/><xs:element minOccurs="0" name="DateDay" type="xs:dateTime"/><xs:element minOccurs="0" name="DataSource" type="tns:WeatherDataSource"/><xs:element minOccurs="0" name="ExpectedDataSource" type="tns:WeatherDataSource"/><xs:element minOccurs="0" name="WeatherDataVariables" nillable="true" type="q1:ArrayOfNullableOfdouble" xmlns:q1="http://schemas.datacontract.org/2004/07/System"/><xs:element minOccurs="0" name="WeatherDataSources" nillable="true" type="q2:ArrayOfNullableOfWeatherDataSourcev_PY1Rzz9" xmlns:q2="http://schemas.datacontract.org/2004/07/System"/><xs:element minOccurs="0" name="PrecNoCor" nillable="true" type="xs:double"/><xs:element minOccurs="0" name="AirtempSpecial" nillable="true" type="xs:double"/><xs:element minOccurs="0" name="PrecSpecial" nillable="true" type="xs:double"/><xs:element minOccurs="0" name="DifradSpecial" nillable="true" type="xs:double"/><xs:element minOccurs="0" name="GloradSpecial" nillable="true" type="xs:double"/><xs:element minOccurs="0" name="WindspeedSpecial" nillable="true" type="xs:double"/><xs:element minOccurs="0" name="WinddirSpecial" nillable="true" type="xs:double"/><xs:element minOccurs="0" name="LeafwetSpecial" nillable="true" type="xs:double"/><xs:element minOccurs="0" name="AirrhSpecial" nillable="true" type="xs:double"/></xs:sequence></xs:complexType><xs:element name="WeatherDataModel" nillable="true" type="tns:WeatherDataModel"/><xs:complexType name="WeatherErrorModel"><xs:sequence><xs:element minOccurs="0" name="ErrorMessages" nillable="true" type="q3:ArrayOfstring" xmlns:q3="http://schemas.microsoft.com/2003/10/Serialization/Arrays"/></xs:sequence></xs:complexType><xs:element name="WeatherErrorModel" nillable="true" type="tns:WeatherErrorModel"/><xs:complexType name="ArrayOfExtendedWeatherResponse"><xs:sequence><xs:element minOccurs="0" maxOccurs="unbounded" name="ExtendedWeatherResponse" nillable="true" type="tns:ExtendedWeatherResponse"/></xs:sequence></xs:complexType><xs:element name="ArrayOfExtendedWeatherResponse" nillable="true" type="tns:ArrayOfExtendedWeatherResponse"/><xs:complexType name="ExtendedWeatherResponse"><xs:sequence><xs:element minOccurs="0" name="WeatherPoint" nillable="true" type="tns:Point"/><xs:element minOccurs="0" name="WeatherData" nillable="true" type="tns:WeatherResponse"/></xs:sequence></xs:complexType><xs:element name="ExtendedWeatherResponse" nillable="true" type="tns:ExtendedWeatherResponse"/><xs:complexType name="Point"><xs:sequence><xs:element minOccurs="0" name="X" type="xs:float"/><xs:element minOccurs="0" name="Y" type="xs:float"/><xs:element minOccurs="0" name="UtmE" type="xs:int"/><xs:element minOccurs="0" name="UtmN" type="xs:int"/></xs:sequence></xs:complexType><xs:element name="Point" nillable="true" type="tns:Point"/></xs:schema><xs:schema elementFormDefault="qualified" targetNamespace="http://schemas.datacontract.org/2004/07/System" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://schemas.datacontract.org/2004/07/System"><xs:import namespace="http://schemas.datacontract.org/2004/07/DMIWeatherService.DataContract"/><xs:complexType name="ArrayOfNullableOfdouble"><xs:sequence><xs:element minOccurs="0" maxOccurs="unbounded" name="double" nillable="true" type="xs:double"/></xs:sequence></xs:complexType><xs:element name="ArrayOfNullableOfdouble" nillable="true" type="tns:ArrayOfNullableOfdouble"/><xs:complexType name="ArrayOfNullableOfWeatherDataSourcev_PY1Rzz9"><xs:sequence><xs:element minOccurs="0" maxOccurs="unbounded" name="WeatherDataSource" nillable="true" type="q1:WeatherDataSource" xmlns:q1="http://schemas.datacontract.org/2004/07/DMIWeatherService.DataContract"/></xs:sequence></xs:complexType><xs:element name="ArrayOfNullableOfWeatherDataSourcev_PY1Rzz9" nillable="true" type="tns:ArrayOfNullableOfWeatherDataSourcev_PY1Rzz9"/></xs:schema><xs:schema elementFormDefault="qualified" targetNamespace="http://schemas.microsoft.com/2003/10/Serialization/Arrays" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://schemas.microsoft.com/2003/10/Serialization/Arrays"><xs:complexType name="ArrayOfstring"><xs:sequence><xs:element minOccurs="0" maxOccurs="unbounded" name="string" nillable="true" type="xs:string"/></xs:sequence></xs:complexType><xs:element name="ArrayOfstring" nillable="true" type="tns:ArrayOfstring"/></xs:schema></wsdl:types><wsdl:message name="IWeatherService_GetWeatherData_InputMessage"><wsdl:part name="parameters" element="tns:GetWeatherData"/></wsdl:message><wsdl:message name="IWeatherService_GetWeatherData_OutputMessage"><wsdl:part name="parameters" element="tns:GetWeatherDataResponse"/></wsdl:message><wsdl:message name="IWeatherService_GetWeatherDataExtended_InputMessage"><wsdl:part name="parameters" element="tns:GetWeatherDataExtended"/></wsdl:message><wsdl:message name="IWeatherService_GetWeatherDataExtended_OutputMessage"><wsdl:part name="parameters" element="tns:GetWeatherDataExtendedResponse"/></wsdl:message><wsdl:message name="IWeatherService_GetWeatherDataMultipoint_InputMessage"><wsdl:part name="parameters" element="tns:GetWeatherDataMultipoint"/></wsdl:message><wsdl:message name="IWeatherService_GetWeatherDataMultipoint_OutputMessage"><wsdl:part name="parameters" element="tns:GetWeatherDataMultipointResponse"/></wsdl:message><wsdl:message name="IWeatherService_GetWeatherDataMultipointExtended_InputMessage"><wsdl:part name="parameters" element="tns:GetWeatherDataMultipointExtended"/></wsdl:message><wsdl:message name="IWeatherService_GetWeatherDataMultipointExtended_OutputMessage"><wsdl:part name="parameters" element="tns:GetWeatherDataMultipointExtendedResponse"/></wsdl:message><wsdl:portType name="IWeatherService"><wsdl:operation name="GetWeatherData"><wsdl:input wsaw:Action="http://tempuri.org/IWeatherService/GetWeatherData" message="tns:IWeatherService_GetWeatherData_InputMessage"/><wsdl:output wsaw:Action="http://tempuri.org/IWeatherService/GetWeatherDataResponse" message="tns:IWeatherService_GetWeatherData_OutputMessage"/></wsdl:operation><wsdl:operation name="GetWeatherDataExtended"><wsdl:input wsaw:Action="http://tempuri.org/IWeatherService/GetWeatherDataExtended" message="tns:IWeatherService_GetWeatherDataExtended_InputMessage"/><wsdl:output wsaw:Action="http://tempuri.org/IWeatherService/GetWeatherDataExtendedResponse" message="tns:IWeatherService_GetWeatherDataExtended_OutputMessage"/></wsdl:operation><wsdl:operation name="GetWeatherDataMultipoint"><wsdl:input wsaw:Action="http://tempuri.org/IWeatherService/GetWeatherDataMultipoint" message="tns:IWeatherService_GetWeatherDataMultipoint_InputMessage"/><wsdl:output wsaw:Action="http://tempuri.org/IWeatherService/GetWeatherDataMultipointResponse" message="tns:IWeatherService_GetWeatherDataMultipoint_OutputMessage"/></wsdl:operation><wsdl:operation name="GetWeatherDataMultipointExtended"><wsdl:input wsaw:Action="http://tempuri.org/IWeatherService/GetWeatherDataMultipointExtended" message="tns:IWeatherService_GetWeatherDataMultipointExtended_InputMessage"/><wsdl:output wsaw:Action="http://tempuri.org/IWeatherService/GetWeatherDataMultipointExtendedResponse" message="tns:IWeatherService_GetWeatherDataMultipointExtended_OutputMessage"/></wsdl:operation></wsdl:portType><wsdl:binding name="SslOffloadedBasicHttpBinding_IWeatherService" type="tns:IWeatherService"><soap:binding transport="http://schemas.xmlsoap.org/soap/http"/><wsdl:operation name="GetWeatherData"><soap:operation soapAction="http://tempuri.org/IWeatherService/GetWeatherData" style="document"/><wsdl:input><soap:body use="literal"/></wsdl:input><wsdl:output><soap:body use="literal"/></wsdl:output></wsdl:operation><wsdl:operation name="GetWeatherDataExtended"><soap:operation soapAction="http://tempuri.org/IWeatherService/GetWeatherDataExtended" style="document"/><wsdl:input><soap:body use="literal"/></wsdl:input><wsdl:output><soap:body use="literal"/></wsdl:output></wsdl:operation><wsdl:operation name="GetWeatherDataMultipoint"><soap:operation soapAction="http://tempuri.org/IWeatherService/GetWeatherDataMultipoint" style="document"/><wsdl:input><soap:body use="literal"/></wsdl:input><wsdl:output><soap:body use="literal"/></wsdl:output></wsdl:operation><wsdl:operation name="GetWeatherDataMultipointExtended"><soap:operation soapAction="http://tempuri.org/IWeatherService/GetWeatherDataMultipointExtended" style="document"/><wsdl:input><soap:body use="literal"/></wsdl:input><wsdl:output><soap:body use="literal"/></wsdl:output></wsdl:operation></wsdl:binding><wsdl:service name="WeatherService"><wsdl:port name="SslOffloadedBasicHttpBinding_IWeatherService" binding="tns:SslOffloadedBasicHttpBinding_IWeatherService"><soap:address location="https://dmiweatherservice-plant.dlbr.dk/DMIWeatherService.svc"/></wsdl:port></wsdl:service></wsdl:definitions>
\ No newline at end of file
diff --git a/src/wsdl/dmiweatherservice-plant.dlbr.dk/DMIWeatherService.svc.xml b/src/wsdl/dmiweatherservice-plant.dlbr.dk/DMIWeatherService.svc.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ed22b3a085971de8fc72e19265509275850032ac
--- /dev/null
+++ b/src/wsdl/dmiweatherservice-plant.dlbr.dk/DMIWeatherService.svc.xml
@@ -0,0 +1,21 @@
+<HTML><HEAD><link rel="alternate" type="text/xml" href="https://dmiweatherservice-plant.dlbr.dk/DMIWeatherService.svc?disco"/><STYLE type="text/css">#content{ FONT-SIZE: 0.7em; PADDING-BOTTOM: 2em; MARGIN-LEFT: 30px}BODY{MARGIN-TOP: 0px; MARGIN-LEFT: 0px; COLOR: #000000; FONT-FAMILY: Verdana; BACKGROUND-COLOR: white}P{MARGIN-TOP: 0px; MARGIN-BOTTOM: 12px; COLOR: #000000; FONT-FAMILY: Verdana}PRE{BORDER-RIGHT: #f0f0e0 1px solid; PADDING-RIGHT: 5px; BORDER-TOP: #f0f0e0 1px solid; MARGIN-TOP: -5px; PADDING-LEFT: 5px; FONT-SIZE: 1.2em; PADDING-BOTTOM: 5px; BORDER-LEFT: #f0f0e0 1px solid; PADDING-TOP: 5px; BORDER-BOTTOM: #f0f0e0 1px solid; FONT-FAMILY: Courier New; BACKGROUND-COLOR: #e5e5cc}.heading1{MARGIN-TOP: 0px; PADDING-LEFT: 15px; FONT-WEIGHT: normal; FONT-SIZE: 26px; MARGIN-BOTTOM: 0px; PADDING-BOTTOM: 3px; MARGIN-LEFT: -30px; WIDTH: 100%; COLOR: #ffffff; PADDING-TOP: 10px; FONT-FAMILY: Tahoma; BACKGROUND-COLOR: #003366}.intro{MARGIN-LEFT: -15px}</STYLE><TITLE>WeatherService Service</TITLE></HEAD><BODY><DIV id="content"><P class="heading1">WeatherService Service</P><BR/><P class="intro">You have created a service.<P class='intro'>To test this service, you will need to create a client and use it to call the service. You can do this using the svcutil.exe tool from the command line with the following syntax:</P> <BR/><PRE>svcutil.exe <A HREF="https://dmiweatherservice-plant.dlbr.dk/DMIWeatherService.svc?wsdl">https://dmiweatherservice-plant.dlbr.dk/DMIWeatherService.svc?wsdl</A></PRE><P>You can also access the service description as a single file:<BR/><PRE><A HREF="https://dmiweatherservice-plant.dlbr.dk/DMIWeatherService.svc?singleWsdl">https://dmiweatherservice-plant.dlbr.dk/DMIWeatherService.svc?singleWsdl</A></PRE></P></P><P class="intro"/>This will generate a configuration file and a code file that contains the client class. Add the two files to your client application and use the generated client class to call the Service. For example:<BR/><P class='intro'><B>C#</B></P><PRE><font color="blue">class </font><font color="teal">Test
+</font>{
+<font color="blue"> static void </font>Main()
+ {
+ <font color="teal">WeatherServiceClient</font> client = <font color="blue">new </font><font color="teal">WeatherServiceClient</font>();
+
+<font color="green"> // Use the 'client' variable to call operations on the service.
+
+</font><font color="green"> // Always close the client.
+</font> client.Close();
+ }
+}
+</PRE><BR/><P class='intro'><B>Visual Basic</B></P><PRE><font color="blue">Class </font><font color="teal">Test
+</font><font color="blue"> Shared Sub </font>Main()
+<font color="blue"> Dim </font>client As <font color="teal">WeatherServiceClient</font> = <font color="blue">New </font><font color="teal">WeatherServiceClient</font>()
+<font color="green"> ' Use the 'client' variable to call operations on the service.
+
+</font><font color="green"> ' Always close the client.
+</font> client.Close()
+<font color="blue"> End Sub
+</font><font color="blue">End Class</font></PRE></DIV></BODY></HTML>
\ No newline at end of file