Merge branch 'main' into service6-definition

bcgov · Apr 23, 2024 · 44201a9 · 44201a9
2 parents fd56a7b + 4cf6cb7
commit 44201a9
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/client/wfnews-war/src/main/webapp/config.jsp b/client/wfnews-war/src/main/webapp/config.jsp
@@ -126,6 +126,11 @@
       openmaps = openmaps.substring(0, openmaps.length() - 1); //Strip off trailing slash, if it exists.
     }
 
+    String services6 = EnvironmentVariable.getVariable("SERVICES6_BASE_URL"); 
+    if (services6 != null && services6.endsWith("/")) {
+      services6 = services6.substring(0, services6.length() - 1); //Strip off trailing slash, if it exists.
+    }
+
     // External Application Section
     json.append("\"mapServices\":{");
       json.append("\"openmapsBaseUrl\":\"").append(openmaps).append("\"").append(",");