Skip to content

Commit 218a919

Browse files
etpinardetpinard
authored
Merge pull request #4048 from plotly/fixup-geo-scope-lake-polygons
Fix lakes and rivers geometry on scoped geo subplots
2 parents 674f0b0 + 5385673 commit 218a919

14 files changed

+278
-14
lines changed

‎dist/topojson/africa_110m.json

+1-1
Large diffs are not rendered by default.

‎dist/topojson/africa_50m.json

+1-1
Large diffs are not rendered by default.

‎dist/topojson/asia_110m.json

+1-1
Large diffs are not rendered by default.

‎dist/topojson/asia_50m.json

+1-1
Large diffs are not rendered by default.

‎dist/topojson/europe_110m.json

+1-1
Large diffs are not rendered by default.

‎dist/topojson/europe_50m.json

+1-1
Large diffs are not rendered by default.

‎dist/topojson/north-america_110m.json

+1-1
Large diffs are not rendered by default.

‎dist/topojson/north-america_50m.json

+1-1
Large diffs are not rendered by default.

‎dist/topojson/south-america_110m.json

+1-1
Large diffs are not rendered by default.

‎dist/topojson/south-america_50m.json

+1-1
Large diffs are not rendered by default.

‎package-lock.json

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@
108108
"regl-splom": "^1.0.7",
109109
"right-now": "^1.0.0",
110110
"robust-orientation": "^1.1.3",
111-
"sane-topojson": "^3.0.1",
111+
"sane-topojson": "^4.0.0",
112112
"strongly-connected-components": "^1.0.1",
113113
"superscript-text": "^1.0.0",
114114
"svg-path-sdf": "^1.1.3",

‎test/image/baselines/geo_lakes-and-rivers.png

249 KB
Loading

‎test/image/mocks/geo_lakes-and-rivers.json

+264
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,264 @@
1+
{
2+
"data": [
3+
{
4+
"type": "scattergeo",
5+
"geo": "geo"
6+
},
7+
{
8+
"type": "scattergeo",
9+
"geo": "geo2"
10+
},
11+
{
12+
"type": "scattergeo",
13+
"geo": "geo3"
14+
},
15+
{
16+
"type": "scattergeo",
17+
"geo": "geo4"
18+
},
19+
{
20+
"type": "scattergeo",
21+
"geo": "geo5"
22+
},
23+
{
24+
"type": "scattergeo",
25+
"geo": "geo6"
26+
},
27+
{
28+
"type": "scattergeo",
29+
"geo": "geo7"
30+
},
31+
{
32+
"type": "scattergeo",
33+
"geo": "geo8"
34+
},
35+
{
36+
"type": "scattergeo",
37+
"geo": "geo9"
38+
},
39+
{
40+
"type": "scattergeo",
41+
"geo": "geo10"
42+
},
43+
{
44+
"type": "scattergeo",
45+
"geo": "geo11"
46+
},
47+
{
48+
"type": "scattergeo",
49+
"geo": "geo12"
50+
},
51+
{
52+
"type": "scattergeo",
53+
"geo": "geo13"
54+
},
55+
{
56+
"type": "scattergeo",
57+
"geo": "geo14"
58+
}
59+
],
60+
"layout": {
61+
"grid": {
62+
"rows": 7,
63+
"columns": 2
64+
},
65+
"width": 600,
66+
"height": 1500,
67+
"geo": {
68+
"scope": "world",
69+
"resolution": 110,
70+
"domain": {
71+
"column": 0,
72+
"row": 0
73+
},
74+
"landcolor": "brown",
75+
"showland": true,
76+
"lakecolor": "blue",
77+
"showlakes": true,
78+
"rivercolor": "blue",
79+
"showrivers": true
80+
},
81+
"geo2": {
82+
"scope": "usa",
83+
"resolution": 110,
84+
"domain": {
85+
"column": 0,
86+
"row": 1
87+
},
88+
"landcolor": "brown",
89+
"showland": true,
90+
"lakecolor": "blue",
91+
"showlakes": true,
92+
"rivercolor": "blue",
93+
"showrivers": true
94+
},
95+
"geo3": {
96+
"scope": "europe",
97+
"resolution": 110,
98+
"domain": {
99+
"column": 0,
100+
"row": 2
101+
},
102+
"landcolor": "brown",
103+
"showland": true,
104+
"lakecolor": "blue",
105+
"showlakes": true,
106+
"rivercolor": "blue",
107+
"showrivers": true
108+
},
109+
"geo4": {
110+
"scope": "asia",
111+
"resolution": 110,
112+
"domain": {
113+
"column": 0,
114+
"row": 3
115+
},
116+
"landcolor": "brown",
117+
"showland": true,
118+
"lakecolor": "blue",
119+
"showlakes": true,
120+
"rivercolor": "blue",
121+
"showrivers": true
122+
},
123+
"geo5": {
124+
"scope": "africa",
125+
"resolution": 110,
126+
"domain": {
127+
"column": 0,
128+
"row": 4
129+
},
130+
"landcolor": "brown",
131+
"showland": true,
132+
"lakecolor": "blue",
133+
"showlakes": true,
134+
"rivercolor": "blue",
135+
"showrivers": true
136+
},
137+
"geo6": {
138+
"scope": "north america",
139+
"resolution": 110,
140+
"domain": {
141+
"column": 0,
142+
"row": 5
143+
},
144+
"landcolor": "brown",
145+
"showland": true,
146+
"lakecolor": "blue",
147+
"showlakes": true,
148+
"rivercolor": "blue",
149+
"showrivers": true
150+
},
151+
"geo7": {
152+
"scope": "south america",
153+
"resolution": 110,
154+
"domain": {
155+
"column": 0,
156+
"row": 6
157+
},
158+
"landcolor": "brown",
159+
"showland": true,
160+
"lakecolor": "blue",
161+
"showlakes": true,
162+
"rivercolor": "blue",
163+
"showrivers": true
164+
},
165+
"geo8": {
166+
"scope": "world",
167+
"resolution": 50,
168+
"domain": {
169+
"column": 1,
170+
"row": 0
171+
},
172+
"landcolor": "brown",
173+
"showland": true,
174+
"lakecolor": "blue",
175+
"showlakes": true,
176+
"rivercolor": "blue",
177+
"showrivers": true
178+
},
179+
"geo9": {
180+
"scope": "usa",
181+
"resolution": 50,
182+
"domain": {
183+
"column": 1,
184+
"row": 1
185+
},
186+
"landcolor": "brown",
187+
"showland": true,
188+
"lakecolor": "blue",
189+
"showlakes": true,
190+
"rivercolor": "blue",
191+
"showrivers": true
192+
},
193+
"geo10": {
194+
"scope": "europe",
195+
"resolution": 50,
196+
"domain": {
197+
"column": 1,
198+
"row": 2
199+
},
200+
"landcolor": "brown",
201+
"showland": true,
202+
"lakecolor": "blue",
203+
"showlakes": true,
204+
"rivercolor": "blue",
205+
"showrivers": true
206+
},
207+
"geo11": {
208+
"scope": "asia",
209+
"resolution": 50,
210+
"domain": {
211+
"column": 1,
212+
"row": 3
213+
},
214+
"landcolor": "brown",
215+
"showland": true,
216+
"lakecolor": "blue",
217+
"showlakes": true,
218+
"rivercolor": "blue",
219+
"showrivers": true
220+
},
221+
"geo12": {
222+
"scope": "africa",
223+
"resolution": 50,
224+
"domain": {
225+
"column": 1,
226+
"row": 4
227+
},
228+
"landcolor": "brown",
229+
"showland": true,
230+
"lakecolor": "blue",
231+
"showlakes": true,
232+
"rivercolor": "blue",
233+
"showrivers": true
234+
},
235+
"geo13": {
236+
"scope": "north america",
237+
"resolution": 50,
238+
"domain": {
239+
"column": 1,
240+
"row": 5
241+
},
242+
"landcolor": "brown",
243+
"showland": true,
244+
"lakecolor": "blue",
245+
"showlakes": true,
246+
"rivercolor": "blue",
247+
"showrivers": true
248+
},
249+
"geo14": {
250+
"scope": "south america",
251+
"resolution": 50,
252+
"domain": {
253+
"column": 1,
254+
"row": 6
255+
},
256+
"landcolor": "brown",
257+
"showland": true,
258+
"lakecolor": "blue",
259+
"showlakes": true,
260+
"rivercolor": "blue",
261+
"showrivers": true
262+
}
263+
}
264+
}

0 commit comments

Comments
 (0)