diff --git a/client/wfnews-war/src/main/angular/src/app/services/wf-map.service.ts b/client/wfnews-war/src/main/angular/src/app/services/wf-map.service.ts index 2268bab82a..d8419f21c3 100644 --- a/client/wfnews-war/src/main/angular/src/app/services/wf-map.service.ts +++ b/client/wfnews-war/src/main/angular/src/app/services/wf-map.service.ts @@ -423,7 +423,7 @@ export class WFMapService { const prototype = SMK.TYPE.Viewer.leaflet.prototype; setTimeout(() => { prototype.map.invalidateSize({ animate: false }); - }, 0); + }, 500); }; const oldInit = SMK.TYPE.Viewer.leaflet.prototype.initialize; diff --git a/client/wfnews-war/src/main/angular/src/assets/data/appConfig.mobile.json b/client/wfnews-war/src/main/angular/src/assets/data/appConfig.mobile.json index 3beb228984..7c6ab3d3e8 100644 --- a/client/wfnews-war/src/main/angular/src/assets/data/appConfig.mobile.json +++ b/client/wfnews-war/src/main/angular/src/assets/data/appConfig.mobile.json @@ -70,6 +70,7 @@ "mapServices": { "openmapsBaseUrl": "#{OPENMAPS_BASE_URL}#", "drivebcBaseUrl": "#{DRIVEBC_BASE_URL}#", + "services6BaseUrl": "#{SERVICES6_BASE_URL}#", "wfnews": "#{WFNEWS_API_URL}#" }, diff --git a/client/wfnews-war/src/main/webapp/config.jsp b/client/wfnews-war/src/main/webapp/config.jsp index 031bba97ec..3171973033 100644 --- a/client/wfnews-war/src/main/webapp/config.jsp +++ b/client/wfnews-war/src/main/webapp/config.jsp @@ -126,11 +126,6 @@ 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(",");