Skip to content

Commit ec0b0a4

Browse files
authored
Merge pull request #1077 from plotly/new-topojsons
New topojson files!
2 parents e397429 + e1a5c09 commit ec0b0a4

File tree

6 files changed

+2
-2
lines changed

6 files changed

+2
-2
lines changed

Diff for: package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
"ndarray-ops": "^1.2.2",
8686
"right-now": "^1.0.0",
8787
"robust-orientation": "^1.1.3",
88-
"sane-topojson": "^1.2.0",
88+
"sane-topojson": "^2.0.0",
8989
"superscript-text": "^1.0.0",
9090
"tinycolor2": "^1.3.0",
9191
"topojson": "^1.6.20",

Diff for: src/plots/geo/layout/defaults.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ function handleGeoDefaults(geoLayoutIn, geoLayoutOut, coerce) {
7373
coerce('riverwidth');
7474
}
7575

76-
show = coerce('showcountries', isScoped);
76+
show = coerce('showcountries', isScoped && scope !== 'usa');
7777
if(show) {
7878
coerce('countrycolor');
7979
coerce('countrywidth');

Diff for: test/image/baselines/geo_canadian-cites.png

1.45 KB
Loading

Diff for: test/image/baselines/geo_choropleth-usa.png

-52 Bytes
Loading
1.02 KB
Loading

Diff for: test/image/baselines/geo_usa-states.png

451 Bytes
Loading

0 commit comments

Comments
 (0)