Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix map shift issue and config for mobile #1829

Merged
merged 2 commits into from
Apr 23, 2024
Merged

Fix map shift issue and config for mobile #1829

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e6db794
Remove duplicate definition
sukhpalp Apr 23, 2024
dadfbbf
Push spinner off screen while keeping width correct
sukhpalp Apr 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...-war/src/main/angular/src/app/components/wf-map-container/wf-map-container.component.scss
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion client/wfnews-war/src/main/angular/src/app/services/wf-map.service.ts
View file
Open in desktop
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
1 change: 1 addition & 0 deletions client/wfnews-war/src/main/angular/src/assets/data/appConfig.mobile.json
View file
Open in desktop
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
View file
Open in desktop
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
Loading