Changeset 16412 in josm for trunk/src/org
- Timestamp:
- 2020-05-15T20:17:24+02:00 (5 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/io/imagery/WMSImagery.java
r15716 r16412 56 56 // CHECKSTYLE.OFF: SingleSpaceSeparator 57 57 // WMS 1.0 - 1.3.0 58 private static final QName CAPABILITI TES_ROOT_130 = new QName("WMS_Capabilities", WMS_NS_URL);58 private static final QName CAPABILITIES_ROOT_130 = new QName(WMS_NS_URL, "WMS_Capabilities"); 59 59 private static final QName QN_ABSTRACT = new QName(WMS_NS_URL, "Abstract"); 60 60 private static final QName QN_CAPABILITY = new QName(WMS_NS_URL, "Capability"); … … 374 374 375 375 private void attemptGetCapabilities(String url) throws IOException, WMSGetCapabilitiesException { 376 Logging.debug("Trying WMS getcapabilities with url {0}", url);376 Logging.debug("Trying WMS GetCapabilities with url {0}", url); 377 377 try (CachedFile cf = new CachedFile(url); InputStream in = cf.setHttpHeaders(headers). 378 378 setMaxAge(7 * CachedFile.DAYS). … … 385 385 if (event == XMLStreamReader.START_ELEMENT) { 386 386 if (tagEquals(CAPABILITIES_ROOT_111, reader.getName())) { 387 // version 1.1.1 388 this.version = reader.getAttributeValue(null, "version"); 389 if (this.version == null) { 390 this.version = "1.1.1"; 391 } 387 this.version = Utils.firstNotEmptyString("1.1.1", 388 reader.getAttributeValue(null, "version")); 392 389 } 393 if (tagEquals(CAPABILITITES_ROOT_130, reader.getName())) { 394 this.version = reader.getAttributeValue(WMS_NS_URL, "version"); 390 if (tagEquals(CAPABILITIES_ROOT_130, reader.getName())) { 391 this.version = Utils.firstNotEmptyString("1.3.0", 392 reader.getAttributeValue(WMS_NS_URL, "version"), 393 reader.getAttributeValue(null, "version")); 395 394 } 396 395 if (tagEquals(QN_SERVICE, reader.getName())) {
Note:
See TracChangeset
for help on using the changeset viewer.