Index: /trunk/src/org/openstreetmap/josm/io/imagery/WMSImagery.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/io/imagery/WMSImagery.java (revision 16411)
+++ /trunk/src/org/openstreetmap/josm/io/imagery/WMSImagery.java (revision 16412)
@@ -56,5 +56,5 @@
// CHECKSTYLE.OFF: SingleSpaceSeparator
// WMS 1.0 - 1.3.0
- private static final QName CAPABILITITES_ROOT_130 = new QName("WMS_Capabilities", WMS_NS_URL);
+ private static final QName CAPABILITIES_ROOT_130 = new QName(WMS_NS_URL, "WMS_Capabilities");
private static final QName QN_ABSTRACT = new QName(WMS_NS_URL, "Abstract");
private static final QName QN_CAPABILITY = new QName(WMS_NS_URL, "Capability");
@@ -374,5 +374,5 @@
private void attemptGetCapabilities(String url) throws IOException, WMSGetCapabilitiesException {
- Logging.debug("Trying WMS getcapabilities with url {0}", url);
+ Logging.debug("Trying WMS GetCapabilities with url {0}", url);
try (CachedFile cf = new CachedFile(url); InputStream in = cf.setHttpHeaders(headers).
setMaxAge(7 * CachedFile.DAYS).
@@ -385,12 +385,11 @@
if (event == XMLStreamReader.START_ELEMENT) {
if (tagEquals(CAPABILITIES_ROOT_111, reader.getName())) {
- // version 1.1.1
- this.version = reader.getAttributeValue(null, "version");
- if (this.version == null) {
- this.version = "1.1.1";
- }
+ this.version = Utils.firstNotEmptyString("1.1.1",
+ reader.getAttributeValue(null, "version"));
}
- if (tagEquals(CAPABILITITES_ROOT_130, reader.getName())) {
- this.version = reader.getAttributeValue(WMS_NS_URL, "version");
+ if (tagEquals(CAPABILITIES_ROOT_130, reader.getName())) {
+ this.version = Utils.firstNotEmptyString("1.3.0",
+ reader.getAttributeValue(WMS_NS_URL, "version"),
+ reader.getAttributeValue(null, "version"));
}
if (tagEquals(QN_SERVICE, reader.getName())) {
Index: /trunk/test/data/regress/19193/capabilities.xml
===================================================================
--- /trunk/test/data/regress/19193/capabilities.xml (revision 16412)
+++ /trunk/test/data/regress/19193/capabilities.xml (revision 16412)
@@ -0,0 +1,202 @@
+
+
+
+ WMS
+ INSPIRE-WMS BB Geografische Bezeichnungen ALKIS
+ Dieser Dienst stellt für das INSPIRE-Thema Geografische Bezeichnungen aus ALKIS umgesetzte Daten bereit.
+
+ opendata
+ Geobasisdaten
+ AdV
+ WMS
+ AdV-OWS-Basisprofil
+ AdV-WMS-Profil 4.0.0
+ AdV-INSPIRE-Produktspezifikation (Version 1.0.0)
+ BB
+ Brandenburg
+ inspireidentifiziert
+ infoMapAccessService
+ INSPIRE-WMS_BB_Geografische_Bezeichnungen_ALKIS
+ ALKIS
+ Amtliches Liegenschaftskatasterinformationssystem
+ Geografische Bezeichnungen
+ Geographical Names
+
+
+
+
+ Kundenservice
+ Landesvermessung und Geobasisinformation Brandenburg (LGB)
+
+
+ postalisch
+ Heinrich-Mann-Allee 103
+ Potsdam
+ Brandenburg
+ 14473
+ DE
+
+ +49-331-8844-123
+ +49-331-8844-16123
+ kundenservice@geobasis-bb.de
+
+ kostenfrei, unter Beachtung der Lizenzbedingungen
+ Nutzungsbedingungen: Datenlizenz Deutschland - Namensnennung - Version 2.0, https://www.govdata.de/dl-de/by-2-0; dl-de-by-2.0, Namensnennung: "GeoBasis-DE/LGB", Beispiel: „© GeoBasis-DE/LGB, dl-de/by-2-0, (Daten geändert)“, (Klammer = optional)
+ 8000
+ 8000
+
+
+
+
+ text/xml
+
+
+
+
+
+
+
+
+
+ image/png
+ image/jpeg
+ image/gif
+
+
+
+
+
+
+
+
+
+
+
+
+ text/xml;subtype=gml/3.2.1
+ text/html
+
+
+
+
+
+
+
+
+
+
+ XML
+ INIMAGE
+ BLANK
+
+
+
+ https://isk.geobasis-bb.de/geomis-csw/service?REQUEST=GetRecordById&service=CSW&version=2.0.2&resultType=results&typeNames=csw:Record&elementSetName=full&ID=7347fb33-4a38-4f1c-a133-46c60cbd793b
+ application/vnd.ogc.csw.GetRecordByIdResponse_xml
+
+
+
+ ger
+
+
+
+ ger
+
+
+
+ INSPIRE GN ALKIS BB
+ INSPIRE Geografische Bezeichnungen aus ALKIS in BB
+ EPSG:25833
+ EPSG:25832
+ EPSG:4326
+ EPSG:4258
+ EPSG:3034
+ EPSG:3035
+ EPSG:3044
+ EPSG:3045
+ EPSG:3857
+ EPSG:4839
+ EPSG:5650
+ EPSG:4647
+ urn:adv:crs:ETRS89_UTM33
+ urn:adv:crs:ETRS89_UTM32
+ urn:adv:crs:WGS84_Lat-Lon
+ urn:adv:crs:ETRS89_Lat-Lon
+ urn:adv:crs:ETRS89_LCC
+ urn:adv:crs:ETRS89_LAEA
+ urn:adv:crs:ETRS89_UTM32_N-E
+ urn:adv:crs:ETRS89_UTM33_N-E
+ urn:adv:crs:WGS84_Pseudo-Mercator
+ urn:adv:crs:ETRS89_LCC_N-E
+ urn:adv:crs:ETRS89_UTM33_zE-N
+ urn:adv:crs:ETRS89_UTM32_zE-N
+
+ 10.8978490830899
+ 14.9049379960258
+ 51.2999957016739
+ 53.5999945122912
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ GN.GeographicalNames
+ Geografische Bezeichnungen
+ Geografische Bezeichnungen
+
+ Benannter Ort
+ Named Place
+ endonym
+ exonym
+ feature name
+ geographical name
+ location name
+ name
+ place name
+ spatial object name
+ toponym
+ toponymy
+
+
+
+
+
+ text/xml
+
+
+
+ 1
+ 20000
+
+
+
+
Index: /trunk/test/unit/org/openstreetmap/josm/io/imagery/WMSImageryTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/io/imagery/WMSImageryTest.java (revision 16411)
+++ /trunk/test/unit/org/openstreetmap/josm/io/imagery/WMSImageryTest.java (revision 16412)
@@ -3,4 +3,5 @@
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
@@ -84,15 +85,30 @@
@Test
public void testTicket16248() throws IOException, WMSGetCapabilitiesException {
- tileServer.stubFor(
- WireMock.get(WireMock.anyUrl())
- .willReturn(WireMock.aResponse().withBody(
- Files.readAllBytes(Paths.get(TestUtils.getRegressionDataFile(16248, "capabilities.xml")))
- ))
- );
+ byte[] capabilities = Files.readAllBytes(Paths.get(TestUtils.getRegressionDataFile(16248, "capabilities.xml")));
+ tileServer.stubFor(WireMock.get(WireMock.anyUrl()).willReturn(WireMock.aResponse().withBody(capabilities)));
WMSImagery wms = new WMSImagery(tileServer.url("any"));
assertEquals("http://wms.hgis.cartomatic.pl/topo/3857/m25k?", wms.buildRootUrl());
assertEquals("wms.hgis.cartomatic.pl", wms.getLayers().get(0).getName());
- assertEquals("http://wms.hgis.cartomatic.pl/topo/3857/m25k?FORMAT=image/png&TRANSPARENT=TRUE&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&"
- + "LAYERS=wms.hgis.cartomatic.pl&STYLES=&SRS={proj}&WIDTH={width}&HEIGHT={height}&BBOX={bbox}",
+ assertEquals("http://wms.hgis.cartomatic.pl/topo/3857/m25k?FORMAT=image/png&TRANSPARENT=TRUE&VERSION=1.3.0&SERVICE=WMS&REQUEST=GetMap&"
+ + "LAYERS=wms.hgis.cartomatic.pl&STYLES=&CRS={proj}&WIDTH={width}&HEIGHT={height}&BBOX={bbox}",
+ wms.buildGetMapUrl(wms.getLayers(), (List) null, true));
+ }
+
+ /**
+ * Non-regression test for bug #19193.
+ * @throws IOException if any I/O error occurs
+ * @throws WMSGetCapabilitiesException never
+ */
+ @Test
+ public void testTicket19193() throws IOException, WMSGetCapabilitiesException {
+ byte[] capabilities = Files.readAllBytes(Paths.get(TestUtils.getRegressionDataFile(19193, "capabilities.xml")));
+ tileServer.stubFor(WireMock.get(WireMock.anyUrl()).willReturn(WireMock.aResponse().withBody(capabilities)));
+ WMSImagery wms = new WMSImagery(tileServer.url("any"));
+ assertEquals("https://inspire.brandenburg.de/services/gn_alkis_wms?", wms.buildRootUrl());
+ assertEquals(1, wms.getLayers().size());
+ assertNull(wms.getLayers().get(0).getName());
+ assertEquals("INSPIRE GN ALKIS BB", wms.getLayers().get(0).getTitle());
+ assertEquals("https://inspire.brandenburg.de/services/gn_alkis_wms?FORMAT=image/png&TRANSPARENT=TRUE&VERSION=1.3.0&"
+ + "SERVICE=WMS&REQUEST=GetMap&LAYERS=null&STYLES=&CRS={proj}&WIDTH={width}&HEIGHT={height}&BBOX={bbox}",
wms.buildGetMapUrl(wms.getLayers(), (List) null, true));
}