Skip to content

Commit

Permalink
Fix map shift issue and config for mobile (#1829)
Browse files Browse the repository at this point in the history
* Remove duplicate definition

* Push spinner off screen while keeping width correct
  • Loading branch information
sukhpalp authored Apr 23, 2024
1 parent 9c14109 commit 0f33b68
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
order: 2;

&.smk-hidden {
width: 0;
left: 50%;
width: 100%;
left: 100vw;
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@
"mapServices": {
"openmapsBaseUrl": "#{OPENMAPS_BASE_URL}#",
"drivebcBaseUrl": "#{DRIVEBC_BASE_URL}#",
"services6BaseUrl": "#{SERVICES6_BASE_URL}#",
"wfnews": "#{WFNEWS_API_URL}#"
},

Expand Down
5 changes: 0 additions & 5 deletions client/wfnews-war/src/main/webapp/config.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -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(",");
Expand Down

0 comments on commit 0f33b68

Please sign in to comment.