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

Issue 945: fix jumpy narrative map #950

Merged
merged 1 commit into from
Mar 14, 2020
Merged

Issue 945: fix jumpy narrative map #950

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 19 additions & 7 deletions src/components/map/map.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,15 @@ class Map extends React.Component {
maybeInvalidateMapSize(nextProps) {
/* when we procedurally change the size of the card, for instance, when we swap from grid to full */
if (this.state.map && (this.props.width !== nextProps.width || this.props.height !== nextProps.height)) {
window.setTimeout(this.invalidateMapSize.bind(this), 1500);
// first, clear any existing timeout
if (this.map_timeout) {
window.clearTimeout(this.map_timeout);
}
// delay to resize map (when complete, narrative will re-focus map on data)
this.map_timeout = window.setTimeout(
this.invalidateMapSize.bind(this),
this.props.narrativeMode ? 100 : 750
);
}
}
invalidateMapSize() {
Expand Down Expand Up @@ -499,6 +507,11 @@ class Map extends React.Component {

/* Set up leaflet events */
map.on("moveend", this.respondToLeafletEvent.bind(this));
map.on("resize", () => {
if (this.props.narrativeMode) {
this.fitMapBoundsToData(this.state.demeData, this.state.demeIndices);
}
});

this.setState({map});
}
Expand Down Expand Up @@ -582,12 +595,11 @@ class Map extends React.Component {
return;
}

if (!this.state.userHasInteractedWithMap || this.props.narrative) {
if (geoResolutionChanged) {
/* changed geo-resolution in narrative mode => reset view */
this.fitMapBoundsToData(demeData, demeIndices);
} else if (visibilityChanged) {
/* changed visiblity (e.g. filters applied) in narrative mode => reset view */
if (geoResolutionChanged || visibilityChanged) {
/* changed visiblity (e.g. filters applied) in narrative mode => reset view */
if (this.props.narrativeMode) {
this.state.map.fire("resize");
} else if (!this.state.userHasInteractedWithMap) {
this.fitMapBoundsToData(demeData, demeIndices);
}
}
Expand Down