Commit 040bdc1

committed

only show locationmode warning if locationmode is 'country names'

1 parent f4282e0 commit 040bdc1Copy full SHA for 040bdc1

File tree

+20

-22

lines changed

+20

-22

lines changed

Lines changed: 10 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,12 @@ var Lib = require('../../lib');`
`4`	`4`	`var colorscaleDefaults = require('../../components/colorscale/defaults');`
`5`	`5`	`var attributes = require('./attributes');`
`6`	`6`
	`7`	`+const locationmodeBreakingChangeWarning = [`
	`8`	+ 'The library used by the country names `locationmode` option is changing in the next major version.',
	`9`	`+ 'Some country names in existing plots may not work in the new version.',`
	`10`	+ 'To ensure consistent behavior, consider setting `locationmode` to ISO-3.',
	`11`	`+].join(' ');`
	`12`	`+`
`7`	`13`	`module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout) {`
`8`	`14`	`function coerce(attr, dflt) {`
`9`	`15`	`return Lib.coerce(traceIn, traceOut, attributes, attr, dflt);`
`@@ -28,6 +34,10 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout`
`28`	`34`
`29`	`35`	`var locationMode = coerce('locationmode', locationmodeDflt);`
`30`	`36`
	`37`	`+ if(locationMode === 'country names') {`
	`38`	`+ Lib.warn(locationmodeBreakingChangeWarning);`
	`39`	`+ }`
	`40`	`+`
`31`	`41`	`if(locationMode === 'geojson-id') {`
`32`	`42`	`coerce('featureidkey');`
`33`	`43`	`}`

Lines changed: 0 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,18 +9,7 @@ var findExtremes = require('../../plots/cartesian/autorange').findExtremes;`
`9`	`9`
`10`	`10`	`var style = require('./style').style;`
`11`	`11`
`12`		`-const breakingChangeWarning = [`
`13`		- 'The library used by the country names `locationmode` option is changing in an upcoming version.',
`14`		`- 'Country names in existing plots may not work in the new version.'`
`15`		`-].join(' ');`
`16`		`-let firstPlot = true;`
`17`		`-`
`18`	`12`	`function plot(gd, geo, calcData) {`
`19`		`- if(firstPlot) {`
`20`		`- firstPlot = false;`
`21`		`- Lib.warn(breakingChangeWarning);`
`22`		`- }`
`23`		`-`
`24`	`13`	`var choroplethLayer = geo.layers.backplot.select('.choroplethlayer');`
`25`	`14`
`26`	`15`	`Lib.makeTraceGroups(choroplethLayer, calcData, 'trace choropleth').each(function(calcTrace) {`

Lines changed: 10 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,12 @@ var handleFillColorDefaults = require('../scatter/fillcolor_defaults');`
`10`	`10`
`11`	`11`	`var attributes = require('./attributes');`
`12`	`12`
	`13`	`+const locationmodeBreakingChangeWarning = [`
	`14`	+ 'The library used by the country names `locationmode` option is changing in the next major version.',
	`15`	`+ 'Some country names in existing plots may not work in the new version.',`
	`16`	+ 'To ensure consistent behavior, consider setting `locationmode` to ISO-3.',
	`17`	`+].join(' ');`
	`18`	`+`
`13`	`19`	`module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout) {`
`14`	`20`	`function coerce(attr, dflt) {`
`15`	`21`	`return Lib.coerce(traceIn, traceOut, attributes, attr, dflt);`
`@@ -27,6 +33,10 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout`
`27`	`33`
`28`	`34`	`var locationMode = coerce('locationmode', locationmodeDflt);`
`29`	`35`
	`36`	`+ if(locationMode === 'country names') {`
	`37`	`+ Lib.warn(locationmodeBreakingChangeWarning);`
	`38`	`+ }`
	`39`	`+`
`30`	`40`	`if(locationMode === 'geojson-id') {`
`31`	`41`	`coerce('featureidkey');`
`32`	`42`	`}`

Lines changed: 0 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -13,18 +13,7 @@ var calcMarkerSize = require('../scatter/calc').calcMarkerSize;`
`13`	`13`	`var subTypes = require('../scatter/subtypes');`
`14`	`14`	`var style = require('./style');`
`15`	`15`
`16`		`-const breakingChangeWarning = [`
`17`		- 'The library used by the country names `locationmode` option is changing in an upcoming version.',
`18`		`- 'Country names in existing plots may not work in the new version.'`
`19`		`-].join(' ');`
`20`		`-let firstPlot = true;`
`21`		`-`
`22`	`16`	`function plot(gd, geo, calcData) {`
`23`		`- if(firstPlot) {`
`24`		`- firstPlot = false;`
`25`		`- Lib.warn(breakingChangeWarning);`
`26`		`- }`
`27`		`-`
`28`	`17`	`var scatterLayer = geo.layers.frontplot.select('.scatterlayer');`
`29`	`18`	`var gTraces = Lib.makeTraceGroups(scatterLayer, calcData, 'trace scattergeo');`
`30`	`19`

Comments

(0)