support serviceBaseUrl with query parameters other than SERVICE=WMS

Author: davidmoten

grumpy-ogc/src/main/java/com/github/davidmoten/grumpy/wms/CapabilitiesProviderFromCapabilities.java

@@ -12,6 +12,7 @@
 import javax.xml.transform.TransformerException;
 
 import org.apache.commons.io.IOUtils;
+import org.apache.commons.text.StringEscapeUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -40,11 +41,33 @@ public String getCapabilities(HttpServletRequest request) {
         template = template.replace("${imageFormats}", formats(capabilities.getImageFormats()));
         template = template.replace("${infoFormats}", formats(capabilities.getInfoFormats()));
         template = template.replace("${layers}", layers(capabilities.getLayers()));
-        template = template.replace("${serviceBaseUrl}", capabilities.getServiceUrlBase());
+        template = template.replace("${serviceBaseUrl}",
+                StringEscapeUtils.escapeXml11(adjustUrl(capabilities.getServiceUrlBase())));
         log.info("capabilities=\n" + template);
         return template;
     }
 
+    private static final String SERVICE_EQUALS_WMS = "SERVICE=WMS";
+
+    private static String adjustUrl(String u) {
+        // ensure ends in & and contains parameter SERVICE=WMS
+        if (u.contains("?")) {
+            if (u.contains(SERVICE_EQUALS_WMS)) {
+                if (u.endsWith("&")) {
+                    return u;
+                } else {
+                    return u + "&";
+                }
+            } else if (u.endsWith("&")) {
+                return u + SERVICE_EQUALS_WMS + "&";
+            } else {
+                return u + "&" + SERVICE_EQUALS_WMS + "&";
+            }
+        } else {
+            return u + "?" + SERVICE_EQUALS_WMS + "&";
+        }
+    }
+
     private String layers(List<CapabilitiesLayer> layers) {
         StringBuilder s = new StringBuilder();
         for (CapabilitiesLayer layer : layers) {

grumpy-ogc/src/main/resources/wms-capabilities-template.xml

@@ -40,7 +40,7 @@
                         <Get>
                             <OnlineResource
                                 xlink:type="simple"
-                                xlink:href="${serviceBaseUrl}?SERVICE=WMS&amp;" />
+                                xlink:href="${serviceBaseUrl}" />
                         </Get>
                     </HTTP>
                 </DCPType>
@@ -52,7 +52,7 @@
                         <Get>
                             <OnlineResource
                                 xlink:type="simple"
-                                xlink:href="${serviceBaseUrl}?SERVICE=WMS&amp;" />
+                                xlink:href="${serviceBaseUrl}" />
                         </Get>
                     </HTTP>
                 </DCPType>
@@ -64,7 +64,7 @@
                         <Get>
                             <OnlineResource
                                 xlink:type="simple"
-                                xlink:href="${serviceBaseUrl}?SERVICE=WMS&amp;" />
+                                xlink:href="${serviceBaseUrl}&amp;" />
                         </Get>
                     </HTTP>
                 </DCPType>