Skip to content

fix(geo): preserve D3 projection default rotation when user does not set rotation #7956

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

Open
waterWang wants to merge 1 commit into
base: master
Choose a base branch
from
+16 −3
Open

fix(geo): preserve D3 projection default rotation when user does not set rotation #7956

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
19 changes: 16 additions & 3 deletions src/plots/geo/geo.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,9 +303,22 @@ proto.updateProjection = function(geoCalcData, fullLayout) {

// set 'pre-fit' projection
projection
.center([center.lon - rotation.lon, center.lat - rotation.lat])
.rotate([-rotation.lon, -rotation.lat, rotation.roll])
.parallels(projLayout.parallels);
.center([center.lon - rotation.lon, center.lat - rotation.lat]);

// Only override the projection's built-in rotation when the user
// explicitly set it (or when fitbounds derived one). Otherwise
// preserve the D3 projection's default rotation so that projections
// with a non-identity default (e.g. peirce quincuncial, wiechel)
// render in their canonical orientation.
if (fullLayout._input && fullLayout._input[this.id] &&
fullLayout._input[this.id].projection &&
fullLayout._input[this.id].projection.rotation) {
projection.rotate([-rotation.lon, -rotation.lat, rotation.roll]);
} else if (geoLayout.fitbounds) {
projection.rotate([-rotation.lon, -rotation.lat, rotation.roll]);
}

projection.parallels(projLayout.parallels);

// fit projection 'scale' and 'translate' to set lon/lat ranges
var rangeBox = makeRangeBox(lonaxisRange, lataxisRange);
Expand Down