Skip to content

Commit 5c5a792

Browse files
doegdoeg
committed
Merge master, fix conflicts
2 parents f902ce9 + 92b3c9e commit 5c5a792

File tree

14 files changed

+447
-44
lines changed

14 files changed

+447
-44
lines changed

‎image_server/test/mocks/geo_text_chart_arrays.json

+141
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,141 @@
1+
{
2+
"data": [
3+
{
4+
"type": "scattergeo",
5+
"mode": "markers+text",
6+
"lon": [
7+
-73.57,
8+
-79.24,
9+
-123.06,
10+
-114.1,
11+
-113.28,
12+
-75.43,
13+
-63.57,
14+
-123.21,
15+
-97.13,
16+
-104.6
17+
],
18+
"lat": [
19+
45.5,
20+
43.4,
21+
49.13,
22+
51.1,
23+
53.34,
24+
45.24,
25+
44.64,
26+
48.25,
27+
49.89,
28+
50.45
29+
],
30+
"text": [
31+
"Montreal",
32+
"Toronto",
33+
"Vancouver",
34+
"Calgary",
35+
"Edmonton",
36+
"Ottawa",
37+
"Halifax",
38+
"Victoria",
39+
"Winnepeg",
40+
"Regina"
41+
],
42+
"marker": {
43+
"size": 10,
44+
"color": [
45+
"#bebada",
46+
"#fdb462",
47+
"#fb8072",
48+
"#d9d9d9",
49+
"#bc80bd",
50+
"#b3de69",
51+
"#8dd3c7",
52+
"#80b1d3",
53+
"#fccde5",
54+
"#ffffb3"
55+
],
56+
"line": {
57+
"width": 1
58+
}
59+
},
60+
"name": "",
61+
"textposition": [
62+
"top center",
63+
"middle left",
64+
"top center",
65+
"bottom center",
66+
"top right",
67+
"middle left",
68+
"bottom right",
69+
"bottom left",
70+
"top right",
71+
"top right"
72+
],
73+
"textfont": {
74+
"size": [
75+
22,
76+
21,
77+
20,
78+
19,
79+
18,
80+
17,
81+
16,
82+
15,
83+
14,
84+
13
85+
],
86+
"color": [
87+
"#bebada",
88+
"#fdb462",
89+
"#fb8072",
90+
"#d9d9d9",
91+
"#bc80bd",
92+
"#b3de69",
93+
"#8dd3c7",
94+
"#80b1d3",
95+
"#fccde5",
96+
"#ffffb3"
97+
],
98+
"family": [
99+
"Arial, sans-serif",
100+
"Balto, sans-serif",
101+
"Courier New, monospace",
102+
"Droid Sans, sans-serif",
103+
"Droid Serif, serif",
104+
"Droid Sans Mono, sans-serif",
105+
"Gravitas One, cursive",
106+
"Old Standard TT, serif",
107+
"Open Sans, sans-serif",
108+
"PT Sans Narrow, sans-serif",
109+
"Raleway, sans-serif",
110+
"Times New Roman, Times, serif"
111+
]
112+
},
113+
"uid": "2db7c3"
114+
}
115+
],
116+
"layout": {
117+
"title": "Canadian cities",
118+
"font": {},
119+
"titlefont": {
120+
"size": 28
121+
},
122+
"geo": {
123+
"scope": "north america",
124+
"lonaxis": {
125+
"range": [
126+
-130,
127+
-55
128+
]
129+
},
130+
"lataxis": {
131+
"range": [
132+
40,
133+
70
134+
]
135+
}
136+
},
137+
"width": 800,
138+
"height": 600,
139+
"showlegend": false
140+
}
141+
}

‎image_server/test/mocks/text_chart_arrays.json

+112
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,112 @@
1+
{
2+
"data": [
3+
{
4+
"x": [
5+
0,
6+
1,
7+
2
8+
],
9+
"y": [
10+
1,
11+
1,
12+
1
13+
],
14+
"mode": "lines+markers+text",
15+
"name": "Lines, Markers and Text",
16+
"text": [
17+
"Text A",
18+
"Text B",
19+
"Text C"
20+
],
21+
"textfont": {
22+
"family": [
23+
"Droid Sans, sans-serif",
24+
"Old Standard TT, serif",
25+
"PT Sans Narrow, sans-serif"
26+
],
27+
"size": [
28+
20,
29+
10,
30+
25
31+
],
32+
"color": [
33+
"red",
34+
"blue",
35+
"green"
36+
]
37+
},
38+
"textposition": [
39+
"top right",
40+
"top left",
41+
"top left"
42+
],
43+
"type": "scatter",
44+
"uid": "459c77"
45+
},
46+
{
47+
"x": [
48+
0,
49+
1,
50+
2
51+
],
52+
"y": [
53+
2,
54+
2,
55+
2
56+
],
57+
"mode": "lines+markers+text",
58+
"name": "Lines and Text",
59+
"text": [
60+
"Text G",
61+
"Text H",
62+
"Text I"
63+
],
64+
"textfont": {
65+
"family": [
66+
"Droid Sans Mono, sans-serif",
67+
"Raleway, sans-serif",
68+
"Times New Roman, Times, serif"
69+
],
70+
"size": [
71+
18,
72+
20,
73+
40
74+
],
75+
"color": [
76+
"black",
77+
"#d3d3d2",
78+
"#ed6100"
79+
]
80+
},
81+
"textposition": [
82+
"bottom right",
83+
"bottom left",
84+
"bottom left"
85+
],
86+
"type": "scatter",
87+
"uid": "f8361c"
88+
}
89+
],
90+
"layout": {
91+
"showlegend": true,
92+
"xaxis": {
93+
"type": "linear",
94+
"range": [
95+
-0.1465172137710168,
96+
2.1465172137710167
97+
],
98+
"autorange": true
99+
},
100+
"yaxis": {
101+
"type": "linear",
102+
"range": [
103+
0.9267515923566879,
104+
2.073248407643312
105+
],
106+
"autorange": true
107+
},
108+
"height": 450,
109+
"width": 1000,
110+
"autosize": true
111+
}
112+
}

‎image_server/test/mocks/text_chart_invalid-arrays.json

+112
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,112 @@
1+
{
2+
"data": [
3+
{
4+
"x": [
5+
0,
6+
1,
7+
2
8+
],
9+
"y": [
10+
1,
11+
1,
12+
1
13+
],
14+
"mode": "lines+markers+text",
15+
"name": "Lines, Markers and Text",
16+
"text": [
17+
"Text A",
18+
"Text B",
19+
"Text C"
20+
],
21+
"textfont": {
22+
"family": [
23+
"Droid Sans, sans-serif",
24+
"Old Standard TT, serif",
25+
"PT Sans Narrow, sans-serif"
26+
],
27+
"size": [
28+
20,
29+
"not-a-number",
30+
null
31+
],
32+
"color": [
33+
"red",
34+
"blue",
35+
"green"
36+
]
37+
},
38+
"textposition": [
39+
"top right",
40+
"top left",
41+
"top left"
42+
],
43+
"type": "scatter",
44+
"uid": "a8eecb"
45+
},
46+
{
47+
"x": [
48+
0,
49+
1,
50+
2
51+
],
52+
"y": [
53+
2,
54+
2,
55+
2
56+
],
57+
"mode": "lines+markers+text",
58+
"name": "Lines and Text",
59+
"text": [
60+
"Text G",
61+
"Text H",
62+
"Text I"
63+
],
64+
"textfont": {
65+
"family": [
66+
"Droid Sans Mono, sans-serif",
67+
"Raleway, sans-serif",
68+
"Times New Roman, Times, serif"
69+
],
70+
"size": [
71+
18,
72+
20,
73+
40
74+
],
75+
"color": [
76+
null,
77+
"not-a-color",
78+
"#ed6100"
79+
]
80+
},
81+
"textposition": [
82+
"bottom right",
83+
"bottom left",
84+
"bottom left"
85+
],
86+
"type": "scatter",
87+
"uid": "cbf13d"
88+
}
89+
],
90+
"layout": {
91+
"showlegend": true,
92+
"xaxis": {
93+
"type": "linear",
94+
"range": [
95+
-0.1465172137710168,
96+
2.1465172137710167
97+
],
98+
"autorange": true
99+
},
100+
"yaxis": {
101+
"type": "linear",
102+
"range": [
103+
0.9267515923566879,
104+
2.073248407643312
105+
],
106+
"autorange": true
107+
},
108+
"height": 450,
109+
"width": 1000,
110+
"autosize": true
111+
}
112+
}

‎image_server/test/test-images-baseline/geo_text_chart_arrays.png

80.8 KB
Loading

‎image_server/test/test-images-baseline/text_chart_arrays.png

26.6 KB
Loading

‎image_server/test/test-images-baseline/text_chart_invalid-arrays.png

24.8 KB
Loading

‎shelly/plotlyjs/static/plotlyjs/src/drawing.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ drawing.font = function(s, family, size, color) {
1919
family = family.family;
2020
}
2121
if(family) s.style('font-family', family);
22-
if(size) s.style('font-size', size+'px');
22+
if(size+1) s.style('font-size', size + 'px');
2323
if(color) s.call(Plotly.Color.fill, color);
2424
};
2525

@@ -762,6 +762,8 @@ drawing.textPointStyle = function(s, trace) {
762762
// ie 2/1.6 * nominal, bcs some markers are a bit bigger
763763
r = d.mrc ? (d.mrc/0.8 + 1) : 0;
764764

765+
fontSize = (isNumeric(fontSize) && fontSize>0) ? fontSize : 0;
766+
765767
p.call(drawing.font,
766768
d.tf || trace.textfont.family,
767769
fontSize,

0 commit comments

Comments
 (0)