Commit 81eff54

committed

refactor: rename min/max scale limits

1 parent 423738f commit 81eff54Copy full SHA for 81eff54

File tree

+13

-13

lines changed

+13

-13

lines changed

Lines changed: 6 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -548,16 +548,16 @@ 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;`
	`551`	`+ var minscale = geoLayout.projection.minscale;`
	`552`	`+ var maxscale = geoLayout.projection.maxscale;`
`553`	`553`
`554`	`554`	`var newScale = (val === 'in') ? 2 * scale : 0.5 * scale;`
`555`	`555`
`556`	`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;`
	`557`	`+ if(newScale > maxscale) {`
	`558`	`+ newScale = maxscale;`
	`559`	`+ } else if(newScale < minscale) {`
	`560`	`+ newScale = minscale;`
`561`	`561`	`}`
`562`	`562`
`563`	`563`	`Registry.call('_guiRelayout', gd, id + '.projection.scale', newScale);`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -177,7 +177,7 @@ var attrs = module.exports = overrideAll({`
`177`	`177`	`'that fits the map\'s lon and lat ranges. '`
`178`	`178`	`].join(' ')`
`179`	`179`	`},`
`180`		`- minScale: {`
	`180`	`+ minscale: {`
`181`	`181`	`valType: 'number',`
`182`	`182`	`min: 0,`
`183`	`183`	`dflt: 0,`
`@@ -187,10 +187,10 @@ var attrs = module.exports = overrideAll({`
`187`	`187`	`'where the map has half the size of base zoom level.'`
`188`	`188`	`].join(' ')`
`189`	`189`	`},`
`190`		`- maxScale: {`
	`190`	`+ maxscale: {`
`191`	`191`	`valType: 'number',`
`192`	`192`	`min: 0,`
`193`		`- dflt: Infinity,`
	`193`	`+ dflt: null,`
`194`	`194`	`description: [`
`195`	`195`	`'Maximal zoom level of the map view.',`
`196`	`196`	`'A maxScale of 2 (200%) corresponds to a zoom level',`

Lines changed: 4 additions & 4 deletions

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

Comments

(0)