Merge pull request #141 from NiordOrg/wms-replacement

Allow WMS Layer without password
NiordOrg · May 14, 2024 · 032b41e · 032b41e
2 parents 2e5bb40 + 0e11944
commit 032b41e
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/niord-web/src/main/java/org/niord/web/wms/WmsProxyServlet.java b/niord-web/src/main/java/org/niord/web/wms/WmsProxyServlet.java
@@ -119,8 +119,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) t
         WebUtils.cache(response, CACHE_TIMEOUT);
 
         // Check that the WMS provider has been defined using system properties
-        if (StringUtils.isBlank(wmsProvider) ||
-                StringUtils.isBlank(wmsPassword)) {
+        if (StringUtils.isBlank(wmsProvider)) {
             response.sendRedirect(BLANK_IMAGE);
             return;
         }
@@ -132,14 +131,16 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) t
                 .filter(p -> StringUtils.isBlank(wmsLayers) || !"layers".equalsIgnoreCase(p.getKey()))
                 .map(p -> String.format("%s=%s", p.getKey(), p.getValue()[0]))
                 .collect(Collectors.joining("&"));
-        params += String.format("&TOKEN=%s", wmsPassword);
+        if (!StringUtils.isBlank(wmsPassword)) {
+            params += String.format("&TOKEN=%s", wmsPassword);
+        }
         if (StringUtils.isNotBlank(wmsLayers)) {
             params += String.format("&LAYERS=%s", wmsLayers);
         }
 
         String url = wmsProvider + "?" + params;
+
         log.trace("Loading image " + url);
-
         try {
             URL urlUrl = new URL(url);
             URLConnection con = urlUrl.openConnection();