Changeset 13274 in josm

Timestamp:

2018-01-03T23:17:07+01:00 (6 years ago)

Author:

Don-vip

Message:

fix #15730 - support WMS capabilities with embedded HTML in layer Abstract tag

Location:

trunk

Files:

• src/org/openstreetmap/josm/io/imagery/WMSImagery.java (modified) (7 diffs)
• test/data/regress/15730 (added)
• test/data/regress/15730/capabilities.xml (added)
• test/unit/org/openstreetmap/josm/io/imagery/WMSImageryTest.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/io/imagery/WMSImagery.java

@@ -4 +4 @@
 import java.awt.HeadlessException;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.StringReader;
 import java.io.StringWriter;
@@ -235 +236 @@
 
         final Response response = HttpClient.create(getCapabilitiesUrl).connect();
-        String incomingData = null;
 
         if (response.getResponseCode() >= 400) {
@@ -241 +241 @@
         }
 
+        parseCapabilities(serviceUrlStr, response.getContent());
+    }
+
+    void parseCapabilities(String serviceUrlStr, InputStream contentStream) throws IOException, WMSGetCapabilitiesException {
+        String incomingData = null;
         try {
             DocumentBuilder builder = Utils.newSafeDOMBuilder();
@@ -247 +252 @@
                 return new InputSource(new StringReader(""));
             });
-            Document document = builder.parse(response.getContent());
+            Document document = builder.parse(contentStream);
             Element root = document.getDocumentElement();
 
@@ -369 +374 @@
         getChildrenStream(element)
             .filter(child -> "CRS".equals(child.getNodeName()) || "SRS".equals(child.getNodeName()))
-            .map(child -> (String) getContent(child))
+            .map(child -> getContent(child))
             .filter(crs -> !crs.isEmpty())
             .map(crs -> crs.trim().toUpperCase(Locale.ENGLISH))
@@ -421 +426 @@
             return missing;
         else {
-            String content = (String) getContent(child);
+            String content = getContent(child);
             return (!content.isEmpty()) ? content : empty;
         }
     }
 
-    private static Object getContent(Element element) {
+    private static String getContent(Element element) {
         NodeList nl = element.getChildNodes();
         StringBuilder content = new StringBuilder();
@@ -433 +438 @@
             switch (node.getNodeType()) {
                 case Node.ELEMENT_NODE:
-                    return node;
+                    content.append(getContent((Element) node));
+                    break;
                 case Node.CDATA_SECTION_NODE:
                 case Node.TEXT_NODE:

trunk/test/unit/org/openstreetmap/josm/io/imagery/WMSImageryTest.java

@@ -3 +3 @@
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.io.IOException;
+import java.io.InputStream;
 
 import org.junit.Rule;
 import org.junit.Test;
+import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.io.imagery.WMSImagery.WMSGetCapabilitiesException;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
@@ -36 +41 @@
         assertEquals("bar", exc.getIncomingData());
     }
+
+    /**
+     * Non-regression test for bug #15730.
+     * @throws IOException if any I/O error occurs
+     * @throws WMSGetCapabilitiesException never
+     */
+    @Test
+    public void testTicket15730() throws IOException, WMSGetCapabilitiesException {
+        try (InputStream is = TestUtils.getRegressionDataStream(15730, "capabilities.xml")) {
+            WMSImagery wms = new WMSImagery();
+            wms.parseCapabilities(null, is);
+            assertEquals(1, wms.getLayers().size());
+            assertTrue(wms.getLayers().get(0).abstr.startsWith("South Carolina  NAIP Imagery 2017    Resolution: 100CM "));
+        }
+    }
 }