Commit 423738f

committed

feat(geo): support min/max scale limits

1 parent caf32e5 commit 423738fCopy full SHA for 423738f

File tree

+44

-1

lines changed

+44

-1

lines changed

Lines changed: 10 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -548,8 +548,18 @@ function handleGeo(gd, ev) {`
`548`	`548`
`549`	`549`	`if(attr === 'zoom') {`
`550`	`550`	`var scale = geoLayout.projection.scale;`
	`551`	`+ var minScale = geoLayout.projection.minScale;`
	`552`	`+ var maxScale = geoLayout.projection.maxScale;`
	`553`	`+`
`551`	`554`	`var newScale = (val === 'in') ? 2 * scale : 0.5 * scale;`
`552`	`555`
	`556`	`+ // make sure the scale is within the min/max bounds`
	`557`	`+ if(newScale > maxScale) {`
	`558`	`+ newScale = maxScale;`
	`559`	`+ } else if(newScale < minScale) {`
	`560`	`+ newScale = minScale;`
	`561`	`+ }`
	`562`	`+`
`553`	`563`	`Registry.call('_guiRelayout', gd, id + '.projection.scale', newScale);`
`554`	`564`	`}`
`555`	`565`	`}`

Lines changed: 9 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -709,6 +709,14 @@ function getProjection(geoLayout) {`
`709`	`709`
`710`	`710`	`projection.precision(constants.precision);`
`711`	`711`
	`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];`
	`718`	`+ };`
	`719`	`+`
`712`	`720`	`if(geoLayout._isSatellite) {`
`713`	`721`	`projection.tilt(projLayout.tilt).distance(projLayout.distance);`
`714`	`722`	`}`
`@@ -806,4 +814,4 @@ function makeRangeBox(lon, lat) {`
`806`	`814`	`[lon0, lat0]`
`807`	`815`	`]]`
`808`	`816`	`};`
`809`		`-}`
	`817`	`+}`

Lines changed: 20 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -177,6 +177,26 @@ var attrs = module.exports = overrideAll({`
`177`	`177`	`'that fits the map\'s lon and lat ranges. '`
`178`	`178`	`].join(' ')`
`179`	`179`	`},`
	`180`	`+ minScale: {`
	`181`	`+ valType: 'number',`
	`182`	`+ min: 0,`
	`183`	`+ dflt: 0,`
	`184`	`+ description: [`
	`185`	`+ 'Minimal zoom level of the map view.',`
	`186`	`+ 'A minScale of 0.5 (50%) corresponds to a zoom level',`
	`187`	`+ 'where the map has half the size of base zoom level.'`
	`188`	`+ ].join(' ')`
	`189`	`+ },`
	`190`	`+ maxScale: {`
	`191`	`+ valType: 'number',`
	`192`	`+ min: 0,`
	`193`	`+ dflt: Infinity,`
	`194`	`+ description: [`
	`195`	`+ 'Maximal zoom level of the map view.',`
	`196`	`+ 'A maxScale of 2 (200%) corresponds to a zoom level',`
	`197`	`+ 'where the map is twice as big as the base layer.'`
	`198`	`+ ].join(' ')`
	`199`	`+ },`
`180`	`200`	`},`
`181`	`201`	`center: {`
`182`	`202`	`lon: {`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -161,6 +161,8 @@ function handleGeoDefaults(geoLayoutIn, geoLayoutOut, coerce, opts) {`
`161`	`161`	`}`
`162`	`162`
`163`	`163`	`coerce('projection.scale');`
	`164`	`+ coerce('projection.minScale');`
	`165`	`+ coerce('projection.maxScale');`
`164`	`166`
`165`	`167`	`show = coerce('showland', !visible ? false : undefined);`
`166`	`168`	`if(show) coerce('landcolor');`
`@@ -205,6 +207,8 @@ function handleGeoDefaults(geoLayoutIn, geoLayoutOut, coerce, opts) {`
`205`	`207`	`// clear attributes that will get auto-filled later`
`206`	`208`	`if(fitBounds) {`
`207`	`209`	`delete geoLayoutOut.projection.scale;`
	`210`	`+ delete geoLayoutOut.projection.minScale;`
	`211`	`+ delete geoLayoutOut.projection.maxScale;`
`208`	`212`
`209`	`213`	`if(isScoped) {`
`210`	`214`	`delete geoLayoutOut.center.lon;`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@ module.exports = createGeoZoom;`
`32`	`32`	`function initZoom(geo, projection) {`
`33`	`33`	`return d3.behavior.zoom()`
`34`	`34`	`.translate(projection.translate())`
	`35`	`+ .scaleExtent(projection.scaleExtent())`
`35`	`36`	`.scale(projection.scale());`
`36`	`37`	`}`
`37`	`38`

Comments

(0)