Commit 29b4316

committed

Trigger initial zoom event to set minscale

1 parent 8ed949f commit 29b4316Copy full SHA for 29b4316

File tree

2 files changed

+29

-13

lines changed

src/plots/geo
- geo.js
- zoom.js

2 files changed

+29

-13

lines changed

`‎src/plots/geo/geo.js`

Lines changed: 13 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -484,7 +484,11 @@ proto.updateFx = function(fullLayout, geoLayout) {`
`484`	`484`
`485`	`485`	`if(dragMode === 'pan') {`
`486`	`486`	`bgRect.node().onmousedown = null;`
`487`		`- bgRect.call(createGeoZoom(_this, geoLayout));`
	`487`	`+ const zoom = createGeoZoom(_this, geoLayout)`
	`488`	`+ bgRect.call(zoom);`
	`489`	`+ // TODO: Figure out how to restrict when this transition occurs. Or is it a no-op if nothing has changed?`
	`490`	`+ // Trigger transition to handle if minscale attribute isn't 0`
	`491`	`+ zoom.event(bgRect.transition())`
`488`	`492`	`bgRect.on('dblclick.zoom', zoomReset);`
`489`	`493`	`if(!gd._context._scrollZoom.geo) {`
`490`	`494`	`bgRect.on('wheel.zoom', null);`
`@@ -709,14 +713,15 @@ function getProjection(geoLayout) {`
`709`	`713`
`710`	`714`	`projection.precision(constants.precision);`
`711`	`715`
`712`		`- // https://github.com/d3/d3-zoom/blob/master/README.md#zoom_scaleExtent`
`713`		`- projection.scaleExtent = function() {`
`714`		`- var minscale = projLayout.minscale;`
`715`		`- var maxscale = projLayout.maxscale;`
`716`		`- if(maxscale === -1) maxscale = Infinity;`
`717`		`- return [100 * minscale, 100 * maxscale];`
	`716`	`+ // https://d3js.org/d3-zoom#zoom_scaleExtent`
	`717`	`+ projection.scaleExtent = () => {`
	`718`	`+ let { minscale, maxscale } = projLayout;`
	`719`	`+ maxscale = maxscale === -1 ? Infinity : maxscale;`
	`720`	`+ const max = Math.max(minscale, maxscale);`
	`721`	`+ const min = Math.min(minscale, maxscale);`
	`722`	`+ return [100 * min, 100 * max];`
`718`	`723`	`};`
`719`		`-`
	`724`	`+`
`720`	`725`	`if(geoLayout._isSatellite) {`
`721`	`726`	`projection.tilt(projLayout.tilt).distance(projLayout.distance);`
`722`	`727`	`}`

`‎src/plots/geo/zoom.js`

Lines changed: 16 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -133,16 +133,21 @@ function zoomNonClipped(geo, projection) {`
`133`	`133`	`function handleZoomstart() {`
`134`	`134`	`d3.select(this).style(zoomstartStyle);`
`135`	`135`
`136`		`- mouse0 = d3.mouse(this);`
	`136`	`+ const { bottom, left, right, top } = this.getBoundingClientRect()`
	`137`	`+ mouse0 = d3.event.sourceEvent`
	`138`	`+ ? d3.mouse(this)`
	`139`	`+ : [(left + right) / 2, (bottom + top) / 2];`
`137`	`140`	`rotate0 = projection.rotate();`
`138`	`141`	`translate0 = projection.translate();`
`139`	`142`	`lastRotate = rotate0;`
`140`	`143`	`zoomPoint = position(mouse0);`
`141`	`144`	`}`
`142`	`145`
`143`	`146`	`function handleZoom() {`
`144`		`- mouse1 = d3.mouse(this);`
`145`		`-`
	`147`	`+ const { bottom, left, right, top } = this.getBoundingClientRect()`
	`148`	`+ mouse1 = d3.event.sourceEvent`
	`149`	`+ ? d3.mouse(this)`
	`150`	`+ : [(left + right) / 2, (bottom + top) / 2];`
`146`	`151`	`if(outside(mouse0)) {`
`147`	`152`	`zoom.scale(projection.scale());`
`148`	`153`	`zoom.translate(projection.translate());`
`@@ -211,7 +216,10 @@ function zoomClipped(geo, projection) {`
`211`	`216`	`zoom.on('zoomstart', function() {`
`212`	`217`	`d3.select(this).style(zoomstartStyle);`
`213`	`218`
`214`		`- var mouse0 = d3.mouse(this);`
	`219`	`+ const { bottom, left, right, top } = this.getBoundingClientRect()`
	`220`	`+ let mouse0 = d3.event.sourceEvent`
	`221`	`+ ? d3.mouse(this)`
	`222`	`+ : [(left + right) / 2, (bottom + top) / 2];`
`215`	`223`	`var rotate0 = projection.rotate();`
`216`	`224`	`var lastRotate = rotate0;`
`217`	`225`	`var translate0 = projection.translate();`
`@@ -220,7 +228,10 @@ function zoomClipped(geo, projection) {`
`220`	`228`	`zoomPoint = position(projection, mouse0);`
`221`	`229`
`222`	`230`	`zoomOn.call(zoom, 'zoom', function() {`
`223`		`- var mouse1 = d3.mouse(this);`
	`231`	`+ const { bottom, left, right, top } = this.getBoundingClientRect()`
	`232`	`+ let mouse1 = d3.event.sourceEvent`
	`233`	`+ ? d3.mouse(this)`
	`234`	`+ : [(left + right) / 2, (bottom + top) / 2];`
`224`	`235`
`225`	`236`	`projection.scale(view.k = d3.event.scale);`
`226`	`237`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit 29b4316

File tree

2 files changed

2 files changed

`‎src/plots/geo/geo.js`

`‎src/plots/geo/zoom.js`

0 commit comments