From e4148da2acdf910e52031e42a16091fe3abe2a0b Mon Sep 17 00:00:00 2001 From: Dominik Moritz Date: Sun, 31 May 2020 18:51:15 -0700 Subject: [PATCH 1/2] refactor: don't use seattle temps dataset for daily data anymore --- examples/specs/bar_yearmonth.vl.json | 4 ++-- examples/specs/bar_yearmonth_custom_format.vl.json | 4 ++-- examples/specs/line_month.vl.json | 4 ++-- examples/specs/line_month_center_band.vl.json | 4 ++-- examples/specs/point_dot_timeunit_color.vl.json | 4 ++-- examples/specs/rect_heatmap_weather.vl.json | 6 +++--- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/examples/specs/bar_yearmonth.vl.json b/examples/specs/bar_yearmonth.vl.json index 99e8097636..2949de2e57 100644 --- a/examples/specs/bar_yearmonth.vl.json +++ b/examples/specs/bar_yearmonth.vl.json @@ -1,12 +1,12 @@ { "$schema": "https://vega.github.io/schema/vega-lite/v4.json", "description": "Temperature in Seattle as a bar chart with yearmonth time unit.", - "data": {"url": "data/seattle-temps.csv"}, + "data": {"url": "data/seattle-weather.csv"}, "mark": "bar", "encoding": { "x": { "timeUnit": "yearmonth", "field": "date", "type": "temporal" }, - "y": {"aggregate": "mean", "field": "temp", "type": "quantitative"} + "y": {"aggregate": "mean", "field": "temp_max", "type": "quantitative"} } } diff --git a/examples/specs/bar_yearmonth_custom_format.vl.json b/examples/specs/bar_yearmonth_custom_format.vl.json index 574bd581a4..89ffdc95af 100644 --- a/examples/specs/bar_yearmonth_custom_format.vl.json +++ b/examples/specs/bar_yearmonth_custom_format.vl.json @@ -1,13 +1,13 @@ { "$schema": "https://vega.github.io/schema/vega-lite/v4.json", "description": "Custom time format on x-axis.", - "data": {"url": "data/seattle-temps.csv"}, + "data": {"url": "data/seattle-weather.csv"}, "mark": "bar", "encoding": { "x": { "timeUnit": "yearmonth", "field": "date", "type": "temporal", "axis": {"format": "%B of %Y"} }, - "y": {"aggregate": "mean", "field": "temp", "type": "quantitative"} + "y": {"aggregate": "mean", "field": "temp_max", "type": "quantitative"} } } diff --git a/examples/specs/line_month.vl.json b/examples/specs/line_month.vl.json index 89949ac530..60541adae3 100644 --- a/examples/specs/line_month.vl.json +++ b/examples/specs/line_month.vl.json @@ -1,6 +1,6 @@ { "$schema": "https://vega.github.io/schema/vega-lite/v4.json", - "data": {"url": "data/seattle-temps.csv"}, + "data": {"url": "data/seattle-weather.csv"}, "mark": { "type": "line", "interpolate": "monotone" @@ -9,6 +9,6 @@ "x": { "timeUnit": "month", "field": "date", "type": "temporal" }, - "y": {"aggregate": "mean", "field": "temp", "type": "quantitative"} + "y": {"aggregate": "mean", "field": "temp_max", "type": "quantitative"} } } diff --git a/examples/specs/line_month_center_band.vl.json b/examples/specs/line_month_center_band.vl.json index 5d3931902f..59f6bf0a07 100644 --- a/examples/specs/line_month_center_band.vl.json +++ b/examples/specs/line_month_center_band.vl.json @@ -1,7 +1,7 @@ { "$schema": "https://vega.github.io/schema/vega-lite/v4.json", "description": "Line with center band for timeUnit", - "data": {"url": "data/seattle-temps.csv"}, + "data": {"url": "data/seattle-weather.csv"}, "mark": { "type": "line", "interpolate": "monotone" @@ -10,6 +10,6 @@ "x": { "timeUnit": "month", "field": "date", "type": "temporal", "band": 0.5 }, - "y": {"aggregate": "mean", "field": "temp", "type": "quantitative"} + "y": {"aggregate": "mean", "field": "temp_max", "type": "quantitative"} } } diff --git a/examples/specs/point_dot_timeunit_color.vl.json b/examples/specs/point_dot_timeunit_color.vl.json index 8bb1b37f90..d50dce1121 100644 --- a/examples/specs/point_dot_timeunit_color.vl.json +++ b/examples/specs/point_dot_timeunit_color.vl.json @@ -1,11 +1,11 @@ { "$schema": "https://vega.github.io/schema/vega-lite/v4.json", - "data": {"url": "data/seattle-temps.csv"}, + "data": {"url": "data/seattle-weather.csv"}, "mark": "point", "encoding": { "color": { "timeUnit": "yearmonth", "field": "date", "type": "temporal" }, - "x": {"aggregate": "mean", "field": "temp", "type": "quantitative"} + "x": {"aggregate": "mean", "field": "temp_max", "type": "quantitative"} } } diff --git a/examples/specs/rect_heatmap_weather.vl.json b/examples/specs/rect_heatmap_weather.vl.json index 721849af17..0503a446d3 100644 --- a/examples/specs/rect_heatmap_weather.vl.json +++ b/examples/specs/rect_heatmap_weather.vl.json @@ -1,9 +1,9 @@ { "$schema": "https://vega.github.io/schema/vega-lite/v4.json", "data": { - "url": "data/seattle-temps.csv" + "url": "data/seattle-weather.csv" }, - "title": "2010 Daily Max Temperature (F) in Seattle, WA", + "title": "Daily Max Temperatures (C) in Seattle, WA", "config": { "view": { "strokeWidth": 0, @@ -32,7 +32,7 @@ "title": "Month" }, "color": { - "field": "temp", + "field": "temp_max", "aggregate": "max", "type": "quantitative", "legend": { From be89f83fff02f4d63e25eceb6cf1aeef598daf64 Mon Sep 17 00:00:00 2001 From: GitHub Actions Bot Date: Mon, 1 Jun 2020 03:43:37 +0000 Subject: [PATCH 2/2] chore: update examples [CI] --- examples/compiled/bar_yearmonth.png | Bin 9421 -> 11912 bytes examples/compiled/bar_yearmonth.svg | 2 +- examples/compiled/bar_yearmonth.vg.json | 16 ++++++------- .../compiled/bar_yearmonth_custom_format.png | Bin 9391 -> 11626 bytes .../compiled/bar_yearmonth_custom_format.svg | 2 +- .../bar_yearmonth_custom_format.vg.json | 16 ++++++------- examples/compiled/line_month.png | Bin 12913 -> 13769 bytes examples/compiled/line_month.svg | 2 +- examples/compiled/line_month.vg.json | 16 ++++++------- examples/compiled/line_month_center_band.png | Bin 12719 -> 13603 bytes examples/compiled/line_month_center_band.svg | 2 +- .../compiled/line_month_center_band.vg.json | 16 ++++++------- .../compiled/point_dot_timeunit_color.png | Bin 10137 -> 10246 bytes .../compiled/point_dot_timeunit_color.svg | 2 +- .../compiled/point_dot_timeunit_color.vg.json | 16 ++++++------- examples/compiled/rect_heatmap_weather.png | Bin 16150 -> 16425 bytes examples/compiled/rect_heatmap_weather.svg | 2 +- .../compiled/rect_heatmap_weather.vg.json | 21 ++++++++++-------- 18 files changed, 58 insertions(+), 55 deletions(-) diff --git a/examples/compiled/bar_yearmonth.png b/examples/compiled/bar_yearmonth.png index 225ca80015b4dae4cae5a9d9ee13e15dfbf178c2..e9917917382f861eff83db6e3050a3d624b4cae9 100644 GIT binary patch literal 11912 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 2010Apr 2010Jul 2010Oct 2010Jan 2011date (year-month)010203040506070Mean of temp \ No newline at end of file +Jan 2012Jan 2013Jan 2014Jan 2015Jan 2016date (year-month)051015202530Mean of temp_max \ No newline at end of file diff --git a/examples/compiled/bar_yearmonth.vg.json b/examples/compiled/bar_yearmonth.vg.json index f14430bc42..cf5c294b94 100644 --- a/examples/compiled/bar_yearmonth.vg.json +++ b/examples/compiled/bar_yearmonth.vg.json @@ -9,7 +9,7 @@ "data": [ { "name": "source_0", - "url": "data/seattle-temps.csv", + "url": "data/seattle-weather.csv", "format": {"type": "csv", "parse": {"date": "date"}}, "transform": [ { @@ -22,12 +22,12 @@ "type": "aggregate", "groupby": ["yearmonth_date", "yearmonth_date_end"], "ops": ["mean"], - "fields": ["temp"], - "as": ["mean_temp"] + "fields": ["temp_max"], + "as": ["mean_temp_max"] }, { "type": "filter", - "expr": "(isDate(datum[\"yearmonth_date\"]) || (isValid(datum[\"yearmonth_date\"]) && isFinite(+datum[\"yearmonth_date\"]))) && isValid(datum[\"mean_temp\"]) && isFinite(+datum[\"mean_temp\"])" + "expr": "(isDate(datum[\"yearmonth_date\"]) || (isValid(datum[\"yearmonth_date\"]) && isFinite(+datum[\"yearmonth_date\"]))) && isValid(datum[\"mean_temp_max\"]) && isFinite(+datum[\"mean_temp_max\"])" } ] } @@ -43,7 +43,7 @@ "fill": {"value": "#4c78a8"}, "ariaRoleDescription": {"value": "bar"}, "description": { - "signal": "\"date (year-month)\" + \": \" + (timeFormat(datum[\"yearmonth_date\"], timeUnitSpecifier([\"year\",\"month\"], {\"year-month\":\"%b %Y \",\"year-month-date\":\"%b %d, %Y \"}))) + \"; \" + \"Mean of temp\" + \": \" + (format(datum[\"mean_temp\"], \"\"))" + "signal": "\"date (year-month)\" + \": \" + (timeFormat(datum[\"yearmonth_date\"], timeUnitSpecifier([\"year\",\"month\"], {\"year-month\":\"%b %Y \",\"year-month-date\":\"%b %d, %Y \"}))) + \"; \" + \"Mean of temp_max\" + \": \" + (format(datum[\"mean_temp_max\"], \"\"))" }, "x2": [ { @@ -59,7 +59,7 @@ }, {"scale": "x", "field": "yearmonth_date_end"} ], - "y": {"scale": "y", "field": "mean_temp"}, + "y": {"scale": "y", "field": "mean_temp_max"}, "y2": {"scale": "y", "value": 0} } } @@ -78,7 +78,7 @@ { "name": "y", "type": "linear", - "domain": {"data": "source_0", "field": "mean_temp"}, + "domain": {"data": "source_0", "field": "mean_temp_max"}, "range": [{"signal": "height"}, 0], "nice": true, "zero": true @@ -130,7 +130,7 @@ "scale": "y", "orient": "left", "grid": false, - "title": "Mean of temp", + "title": "Mean of temp_max", "labelOverlap": true, "tickCount": {"signal": "ceil(height/40)"}, "zindex": 0 diff --git a/examples/compiled/bar_yearmonth_custom_format.png b/examples/compiled/bar_yearmonth_custom_format.png index d80eb7489d1a2853042cd96726c9022aad93ff84..5351cba1e4b93f87c4b3892f0418a5c1b0f0c98f 100644 GIT binary patch literal 11626 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 T=Gd@2jgSzP7ReQU|MhNw;c-*5l~VCoM9 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 bOjJlaYQinou>January of 2010April of 2010July of 2010October of 2010January of 2011date (year-month)010203040506070Mean of temp \ No newline at end of file +January of 2012January of 2013January of 2014January of 2015January of 2016date (year-month)051015202530Mean of temp_max \ No newline at end of file diff --git a/examples/compiled/bar_yearmonth_custom_format.vg.json b/examples/compiled/bar_yearmonth_custom_format.vg.json index 02649bca15..1528161754 100644 --- a/examples/compiled/bar_yearmonth_custom_format.vg.json +++ b/examples/compiled/bar_yearmonth_custom_format.vg.json @@ -9,7 +9,7 @@ "data": [ { "name": "source_0", - "url": "data/seattle-temps.csv", + "url": "data/seattle-weather.csv", "format": {"type": "csv", "parse": {"date": "date"}}, "transform": [ { @@ -22,12 +22,12 @@ "type": "aggregate", "groupby": ["yearmonth_date", "yearmonth_date_end"], "ops": ["mean"], - "fields": ["temp"], - "as": ["mean_temp"] + "fields": ["temp_max"], + "as": ["mean_temp_max"] }, { "type": "filter", - "expr": "(isDate(datum[\"yearmonth_date\"]) || (isValid(datum[\"yearmonth_date\"]) && isFinite(+datum[\"yearmonth_date\"]))) && isValid(datum[\"mean_temp\"]) && isFinite(+datum[\"mean_temp\"])" + "expr": "(isDate(datum[\"yearmonth_date\"]) || (isValid(datum[\"yearmonth_date\"]) && isFinite(+datum[\"yearmonth_date\"]))) && isValid(datum[\"mean_temp_max\"]) && isFinite(+datum[\"mean_temp_max\"])" } ] } @@ -43,7 +43,7 @@ "fill": {"value": "#4c78a8"}, "ariaRoleDescription": {"value": "bar"}, "description": { - "signal": "\"date (year-month)\" + \": \" + (timeFormat(datum[\"yearmonth_date\"], '%B of %Y')) + \"; \" + \"Mean of temp\" + \": \" + (format(datum[\"mean_temp\"], \"\"))" + "signal": "\"date (year-month)\" + \": \" + (timeFormat(datum[\"yearmonth_date\"], '%B of %Y')) + \"; \" + \"Mean of temp_max\" + \": \" + (format(datum[\"mean_temp_max\"], \"\"))" }, "x2": [ { @@ -59,7 +59,7 @@ }, {"scale": "x", "field": "yearmonth_date_end"} ], - "y": {"scale": "y", "field": "mean_temp"}, + "y": {"scale": "y", "field": "mean_temp_max"}, "y2": {"scale": "y", "value": 0} } } @@ -78,7 +78,7 @@ { "name": "y", "type": "linear", - "domain": {"data": "source_0", "field": "mean_temp"}, + "domain": {"data": "source_0", "field": "mean_temp_max"}, "range": [{"signal": "height"}, 0], "nice": true, "zero": true @@ -128,7 +128,7 @@ "scale": "y", "orient": "left", "grid": false, - "title": "Mean of temp", + "title": "Mean of temp_max", "labelOverlap": true, "tickCount": {"signal": "ceil(height/40)"}, "zindex": 0 diff --git a/examples/compiled/line_month.png b/examples/compiled/line_month.png index ef087aa23d22c5f4e082761bfc343bca4b1763ab..bd1528ae649b9453e30fa7089eae763a91f42a88 100644 GIT binary patch literal 13769 zcmch8byQZ}*DWfdC?zQ zH}1G&+<&j{;MD<~bN1PLt-0o!b3OiYGNR}Yh#nvzA)$+l2`j+gNAR_G9|ivJ@#WPt z{Dq<~DJqO~ee+*(U1m5E(laD+VL>IQ_{}LtRi$@ljl0`uXvFe)xRK<~z9sv8OV$s< zn;Mg5d!ix5zPKzBZlB6LE*vNlBobyqPh+Np%YH=kmcD81^`l$zax_Z_t zfh(#<)O^Yt(r2{Q&9|KJHEN>QIYcUq5>*f@@SEn$t@~cd&g8{+o9_F!;3HE|VryUp zhGy5_aSGdQe=g*OcXQh8iJMJD0(%V%VjJ zCU2}g3BK*w?R<1>YE$?elun3mqGg^GNH&Xu|a9DzSUAtiL-3>y3Go578BV zn|Q9j`}LJO{mYlig#q8by?F6LuCBbawB`5jH*sY5)jzCsv)9kqqJ%O#%W0t8bG;oJ zujwO+!xMCn!W6kb@)zTUl=PVG#e@A3661~u_iO{pg6~H`F)CZ%Joh@DzvANRFSpdV zefzeUm>81o>E7bW$;sbLS<|_5J+)^)|+e5i8n% ze}*Yg?T?aXR;C5=-?Bnm+ekU&H)J8)4qWjr`|7na#)fhA{pTUSId?v#Lxt586DOm9 z*53a9d~X5|VnyWd7t&+xXIy;u+EL1H)?$3gk!RjYmvV*VR&j~>VgG^sh@*7c;Vs$# z0!E|mXy%+z9nVX4={OE5N=jk-Zwy0d?*^_YS=LxGs6Sj;zt@el4pdf_^(5df{YcqR zV<^`xl9@2g%4b_v$J^`6~Ppu!AMwm zc&+d&B&G%}evc3jWSvmLkORtf$f;OEradsc9X^goJ|!GKMh)=0t9!;o8aq^?RN`wp z=*-+q>Ukmm;K741cs0`VtEn1CDjuGi=jCMI2-h+aGEL1rrGBxQw7Hm0dQzlc{MOHJ zKS*=<@wQFui&0+GQXZGWW;q*PI3!Y};%)+u<6bL)PLbsVM_yi@(u9G&{-3_S%*x8> z)&PRR6rp>T9~n(l1?5rAkK*s?{{B?18bfzL)c3GX-N3Nm-%xs7i+0a|IlYeroqyfO zRRu^_q4r>6TSv!C^uj@Ff3E1f8Dx7|89^zbBjQ=lb&VDzYuSR=S;6poH&J%$^Gl?Yw@=IHu>4>0jzpFUa5<3Sv3^B0a5-P$iI+fM zo%>q#+gmZpD%54YpuU;;F!=DAG`gi zL2J%Mg+FLboi)W%!`)Z$rC@%7ZI-prSpsixYsMPS)4E6gT3uAre~d1hUcG0D=B~Z- zV~M?Hs8*9fk+{s0%juE0>s>FjSg{Rt`g3iv>r3Wu02o>t>}`E@#q~l1e%erFQ9E}dkksU2o$K0lnqlm z7^Z(I)M+T#)kU6Ct3GwqFEr}UDqz1R8NI6*PUQ6D0@bC$G5vD_-YBbGmCZ|0*ui*2 zi}tVgsEl<7VP>X@larbvK}4;ck#uDw@yWy*!P-lWq%^A0F)aJ(3}b||VO$RsxhSr< z&9<-RsmnH#^Erw)H#Sao+euL|FpMtG4o}X`e(5!%#3vjodZ=V2vc6+ctvi3pLRia} zM^PYB%WIj0#JM(FywH|#Tc2TO$nh0-I!E!0^D^;|ml`5(-rP253nXJ?4Ds{3Pc0pr z7I1=$F46Ia%EFROBE98do%_n1Iq&FjNGia-+dIbO3k+w=pB%+qot>4g#|%_dR7kkE zxS_GJ>U7p(L+=Samv;L*n->UvU=5UWrMi@kIEr!i7b-rqpvTjcscRmmBZLSx9-=-X z&~a-DBxJphiaPr@Maap?X{VQGyU1x*U#sQ0N#oQ7xltkio1?lnZc{|NM@7NxAO4sq zN7G5I%qm_zF64-mb;+SP%2O*Dt8?W9pj#fwR+LKMj)cvG>y;Gc#R-!xY$Beh9ov{H zL}9ku3+k!YBz|z%HK8oxSoN*m-KY1k&%(1+;_4!cPTx3O@Hs&MTPHt(dyMu1w7Nm z(7?2ahK9nTqBw+v zr+@C3ZERRLY$B*e+D3l5Grv>we1?Hj6}ZZX-2Yqr;*rmuLMy&eMvG>>xP*`G42446 z*xR>n*(?#b8X6j5VPQqZ#Z4n4KeTEbl&kwz`cqFY_WQWpPMF{uhU+8wNRySeUy_rb z9c|C_{rOIz*5FaMRPT?}c)FlL9}sv;cQ4ri*@% z%IH#RpO05Fb5tyt~&Mf^V0VFx@!3j}O?f;s-aD7~n`?`5^+(#SZ zkz4Q7)jQ!poKF{{ltov$?bkw+k_ykHJUsaA*CH5?@c%cXc+SOjnqB{A@UO5&>^ITy zO$$GX*@3c&p%P{TDFS1K!ps#uY9X`bZA&#Ih9C>Es>pVqI%Z^NflCC!=VXdR)KdQ% z&ipC&M?ZMR-z<3w*uF*_Qb+NymIxX}lm4G~ug^vslqUH2`1}I`QWZ0078Vz6mwSny zKJB#L`nWpql|ido$>cdbJsKxx1+9B=18~#=2aQ-0p~20xg+E*lG!I!7ajy3JLTL%e z*;=+UdXg^v5;NS2uU_?|dhX4Al99FdF)*3g6!&~OL|q;eL#U#n^4`!;&*FK%D6PHC6-+lR00Scu= z64E<&U!~OOKZZF}fq}dIQ3#5o%k$%o-rl8fS^io0lDG66U_SzWLu*+GOzB`_e1Dt* zkM_iL=B@(EzKK#_ET^x-U&mMM3Nyi5c><5y$6KTnSU%X8>hr#R4zOBnzb+;&p7J&T zpUr#(t*Z9oSz-1%>FoGTaqRl;wD5s&P~`4Nr$2ElKw7fwrzaD^R9J+OjXcdfYdn-e z@^NE5vFyzVM69>>-l7ijCGAVaJ>?df&IoKicj6tZ>DM!4!zL+$Bo{6h4@7&l4BP~C zHY@@Seg-01j`sF`H#L3Uoo^qkakL)xD^bZ;@2|Gs%=)b-M(z=?Z03Ryw5~STH&bbK zvLb}z`ULp#!b0nl4epqh745cN9;j@bmIz^eeR6+)f53K;GWU@@HS%J6`uRRyj;GbC z^=9ow7|~sO!`qZu?61ZYBgdL+Tn)?=_8-b;NpBo&PV9Hm74kaNBx}$)#HUx51}0uH zoK$m;oIUeJ{2tAJ#2~#E7WTcle?R-cWK?s8OgRqV03Dr*jZKN5_`a+S2XlBhfwiuw zRj0uDDbR{k)>mU+3duc;&4&zA#Wu{6>>$F<{e>jIuF=81Y?cckJs!+uKPvy>68z`H z`-D9+xQt7jv!v?dW_f*cc6qEPv;0GNJu&qWt#~2?Hqio5$iT3e-`*a?Q@6(Owe|x( z`L%G^0J%C{{7Z#IePC^l%jtkN+}Ma89s7riBu+#{riWpK#zPWqvaOk*qld1gy^M^w zj`)x`SiYptKs+>r)lkAe;W_ppu}m4YSATdJUDPuEmJ}#70)u z3lxl}VgT)gY$kGFz3$h!9%ndiPpdyHDhG^J%&fl^5oU;s^pxY(uQ%q%Y}p!n>ppoGMO!Ax0WND8U= zSKlGK6jW9Jv;{o@cpH2hU)DBTGAdRbBYlU5&IdW5>BX78o>2}_(J!i;CE~JSZ39tZ zVVnJ>9?{OnK}75iuu5v#vLP&?-9-AAUT?{yn8mnDZz5|FdegFiK0pD1?(VxUmBU-J zK6`w($B)+~CNKW>hwY=0jAi@KBbO{?h%l zbI|+zvXG@STALqOV^+%-(GZ}=8Ps_fc^t*0+DysjqXo#w$XHldjgB+!nE@w(>d=;1 zU*!a{{B)&T8z&N7)iA&XBI+<=q$%AutEul(-z+al|2SFnyC`EgAbl{pg)$B%a`SsL z@=Wtwk&81|B8{I6gCnW_^+GP>`Sg!%HWBO`R+E3AXgjUvSKLQKL)Jasn#$9xQaG%# zoo^dPyzy7#x_j{<%T2Iu^tzwqYj!k|^@>;BlV8`GD8TR@Uxd9@S7Um{&!5QSxMg#= zraUk(pfrJlgHv2yz632ca;Ifkp?|D<>2oFTQcm zX8@y(C+#dvbdA%uLrEl;AEG?vcZ;rZ+#V=45cNTSqOvZcI@Q^0yxy^nRLhZ8SE;Ac z%$8#;9V)9BoY>GCJnxU9F@Kru6M^xV=@aCnzM0v#h6aJEsw(Ab=cVOkUnsIae*Be0+iw}e+ zb<#viprAc&OyqNY%{D<3q%-#fF-q|S`2tT><Rkb{D|_Gg<<1`Is#9hKJ^O@E*SaP)7>qVmv`mpzE}CvPft&e$Tjar ze7xpndCp*)wQ->>8v_n76Y2x2&moS7)=$mmcucEb3Ym+BTk=izM)Tvl?KR5>YuENj z-r?a>taFrZQzR_&ci)|RdvS5`nET_4<=%uljpO4n6BTqiC{)bM-|^^FY?itS_xASu zf`SZz#?@Zzbwx)<>zbN&jO1&a9t_In?%10po~%2bnC)*PNfBT5?ZSpDm-O>71Y)4x-E|n9 zXvo2A*sXf&tw%zQX$u!5#S+owi+-q9xMyf9Pb_bi0hD{HL- zJq;y`CT=~F8};tzEcR^(TOIVCGFUYc8ziwbG?)zvd{ z3K8~RdonhD2goM0#0xG)AjrrA_c=e_Hg58|i&riUy(GMj*~_e0Pz;i}t)kdC$wnw^cKjavo z9+s$Fih#l~NxZ(>(XvIJZSGHf#PM;@Va`dDh$r|t%T^V~8OCad|K(=I%rEzI2arTh zPUb^C?}@(i@bEY}58$cAq@3wC8p)vmt!8f4qAwnmY)tiAT7h)p_FC(1C7VN{*n3qm zNsz)^f|mXLFM&N_J$))=W=0FL!l1Ggd*{~$jf>;<7kdvSckHdZ8`|%#U;5InBs%V+ zoK$j99+~0S$WSxqX-L+!r5-J*0aJLZ@NTZ9^+~t3z4yg$Y%jO?n9C2G--pV^zTCy7 z2+_{SN|P!q_WMPwTzdWE6qt(I8@iKFQj*gC}0v?)C z%!H-V4O;rGg~mwHynm8r$);U`#h56G>k@z{w}YaCks#i$@f0ou(sri{Mv$3cD|(If{w>J8McsjhNZ&4fTz;zo%dIBc{tg!1SZlX5Qdc(yQ0$kagV&JW&9H z+>Tp$xzT8CTZ-ba5g0L2Z8a3!vlbdT+o9e>zlVf-cd)E~S0pZFx)(z@4y=}Hm4(zy zPEPI|9~(nIB$dRU0N^I4q?8sgc0kL`5VVt@dCSRN%=JrdDB0usW$wyZxf!4Jm@4iD zp#q068#OgTKG!2kZf^B5%i$d5r(7S9ad77IemQfKB`}T_>L z#K7frXVC`-R2Wgth9&MNEotRZ(0ySO6Zb%+IGqb%ys0Gp{rwx0Rf+_=tD0}tlDaRs zVnG^c7OHKvGfPpguCVlx46mN->@Z&L5KcJEX@87@I zZf>;RhYY06Z0l3DULA}!TTUI$sA4mmiRtOY zygYgk4{kL=Cj`0-#?jG{I;Kq2Rjq4Mh{{z4E$>O&KJmvZzc)-W#OmAw(}SN~@3vl4 zZhOg`DaDPspC7fhw0MJ#0{Gk1)D#^X%U>*EDy=A|^t&AZm5ztBFXO0IAcK|q=T366 zV4-)pkRGjZU-tU~<3;m20idlL8{NQAO~-#xWn^TOT8xK*RWZAfH?jNyaRc$s&4a_@ z6NLsv?4vJ#z2JRel4x*81I7MGIE<2mv>`Y)vMgsa+o~TO3ch3%gS>*m?{vwim6?VH zl`jL4u!l+4Zh>RDYHUR%bMw1oKjXhAvm3aSwM~zN<;FN~yh@pRVp`^a$WWl!UGxcW z(UfWLMZ|;lWuiLDG|G)1_yvqEYhF^M#x<>Fv4-%>vU)Q^eMxLLVnS%lMvKekc6Pn7 zVmWeBw~M^hlT#}wuC|VFBO{7INHbXv)C5Zi5ASWEcAd#k)}x7XOGV2lN`GKy17H!} zbSokvJ{;AaHICN zt^1(cTp7uK(%RaZvk9bfabvtBp2sn`KUI{~dGEdDM;#jRu=_Ja%||PA(J`@1pv;!y zO6ok|HnP;~j1#&O+M#>6wXZ3Dt~l?`JG?nV_pYD_SjOSghqn(kdl@BWj6KuikA9G0-lMG{roJu2GA-;f*P%$sAxJ}>o!p3 z?+^Mg#*GvxE8AymwycI16|s9+FFaSU46VQJlBCwIt!36Q|6Rd^-OJ0$=&-i~Jr?+u zysh^bQOqsmA`mUp71pE@>0!syt|1~pR~1qwHa0t~ju}cS^jp+XT{LuqRxu+0^8A;x zFKkEcib^<^=TYZk)tS&hupZR8KUY_HY|G0K1YqNwQV}A80GacpdTC=<*ZTLbr#UxT z0Z4v`a?1cp@wCj$+#mBn-@eU_6&r+XC?>p}v!0~UUAz*untA!Npp38(bLX{6wDgA$ z4v`Z>Lq89FMuMp)SW0i4Uk(J}=+sy1V@*9!|LG0io>Zw^H$n$EH8pjUen5e^Z}KQ6 z67!$Qa1LI+MukU4?+xW-Y`A!HeRX-$nDAQPX;28X4ZO!BtW(L!0R*lKWivQ*xG%;uEGP|VKH;2VBptVJ1`BL zavW%3AvdCiiwieceBQpkx#fMa?70Iipv>XkEbU#PHWfE_Ec`Q8$QOfI?>90ADZdn; zHxoO%;U=QY?2D&LE0v*J$tLDeYlP=&J@KTIVUd98XrXB>qu}2NGOgN5+jA1A!@C`r zqNs5Lx#|XVL(~o+E;=tpz9XrrV}ZLE%+$N*jADLU)lgL}0<%CuLPG8ZTLZ4l2N#S0 zj>HAfW|kh{XrGHB)m><@O@}-)Y4-LXI7LFj`*1T0ko#pKJp5e?PzHYW(y{SRVUR*k&`RbUK~Y@m05$@?!o0GUv}mN2*dBhd_RiX zo*e-<57%TcKxDl(%0CMNByp>}kc$jI&qm3ry*!#28ynNLwk|w7K0f?)NOg5aJgxRC z3f-4MAwy}PFqJ1@#zls*OpYRkMk<<*A6chDWU}|=zve~X9JUNiOMOyar_jRsvj;I! zK0!g~(3t>771;I5dsub)7F6ijOKS}9-x#3v)SJ$&bDlp%V%}89>hH#*zF1CLGjoeJVe3<>*&K^Ge3V40GK=n8@hJ zEW;L^9FOTDTzF3%bu9ILy}hwWNo93)pFzblfM_{b>HorP&}Kq^(zy^7v%9-S0oZ-7 z5sV80m$D3NQAhc3sVsK-ZmAfqf`>Y9FM3m0Y20d;R&?kFmFhzfEe`hfiw)P8jIPI9 zhMf^KZs(g73rkC8?jj>VBIB!;??(+5v%K2@59z9ZSaR|)ju{oy^6lUiVXY^23Tn*LDQ1U^{1vj_|7-jVFzh?q?8|C9Cwz9iEo))1!HP-aj-RhZq;IJpHF`8% zJJ#-7%@HZUN#KomP5lM+4q~9O_uFRwJCj+}Q!`bP_$(j3Zt%FYv9ZZ2S_t9z zv&e!#WbC)?-y+YxJ4*%*tlFM~&PJk~6QHV2t zMKCLSNGmKydIQAd@E<=iauPqxwV*O+Rwl<<(cJf%bmqXU-YufIU^$@G-7TgWsZ|u--o<(D}fCX zXghs|PH3b+s|#oVAld~_41`4mKjRI2q8#r_}SUnIitP3y=+$W z_(=rF(u1b@)?-DV!EwX4-riGYY!7-OYGRVbAcWFo|VIT<~(Ytr=@(F}-y%7@B;$gkCD729h3wwJF zRG`)@G-C=ZKn%WK+;0#Ke4LWIgPhWqomcQGED=Im;&5%)bh+BFCOd;^IXlQ6s4BCU; zz__X2(8e-DPoO>mCncK2@Eb!7uD7~4J?+c;B4U)~&mNO~AM?`nhA{=NN7(-V|G$~= z+yT5|9rr^#*Q1So`%y1B^A)xm(oFcu=GlXtGg*G%rVf+Sh(NYr3BHKH48>+LjE(G_MfLID^8WhCujBAw3qlHPy#aK4??laiHHaowH2W4qzH7m|+#X1pvl$}I@L ze*Ieg@D0WBRGG+`%yMI0?g=}18F8UR_to}_Oc+$E`MkRWjc2GhiG^4sLp)oJZl{tCLx2XUrBD=E%u z)Ex=|UWUlz-e2yETKG_P0NIpP&TffNI@|9Pu*d(>L|RPhus-rqrBJ&E;suKI{tEq1Xqsq!KbnrE` z88A{@QgTpCDnwC5Ma0Rea?Re&jTe-lQFTvDuqUaXKlcTU+uQ46+&^7T+6Q>MovcJV z4ij7t@#(W{Mk-*w2^$+*wbqFl%IKhkW}m<{FDQsFB0EK=A%bSR7#rThPhiNv)^?Y| zm;?HNcdi@$R@4Yo7?c0x6P)}VEQmb7W7DxBGC1HsQi1wTcV2K^Zxpdl zhwG!PWs{ofv7C-#L^s^El~Q5t}af~($bWitS?S>KY*Ak`U zA)YCdaIzFMGOtDc9(eP*T zmoJ09J|xgLFi>2)GFQ^aB<7C5Am)akk^tRwywWyxtqy{%zrtGQCik)xGjk?=>+1NR zwWg$|{soldfvDIE()aUobGJVwC6V6rg>}a;P_i>=*EhShrM-A{Z8el74+<;e%~#-4 zu3x`hudc4po^YT+XNQLN9^_1<8>@IY_uZW$(?M!*i@YIU+Voi{0hT~X2oHZQi;ac# zsj!d{d|+x&aOc}Y=E3NP`n57yRYLn2W@4iGTsb~}{!Fh~8A>Jj!-T3FQ{W=BkN;fC zp89Uq+4-`-bq7R8HzW}tzaFe8hqV=SM*h7L4;2UpxN$Fdzc6Vhnj#k(8JX^~-6XF- z9j@$3y8F)*#d&(9x1*#au7T7?xcjNgQ`BzLs4VjirIhCs~UL{BK05N&M*yn;vw ziL{Xsj2Tkrpt2Kle|*Nu8V(X|(TBxOvxKH0WLT)hWaW3LQ8#Uew)>&7f`UR(dAW*v z1~6anyB;AaDk>6jTA_Uc+5*P;UkObJ(M<7hYCMKaurYRac90r7JHG)@g87IJSfTR0 zoc077e!2uqx$Iz2bbAx|0)U4Dwzaghn4~9>3HdM?cH#~{+WCBO;RabV2C5wr+&atV z<@ruoWrnJ%>c92%E*R-4E-A^~nT8pq8!A=ja(ELXgsetc(@z9EcwzE^oRc#OLdu-C zz?TO1+k?@t)zww?&22r2bZoG_Pbj0h2$^(|bUaR}dg3^r^YFxh9Fr>df_6g@q6)wQ zTtP}o%6|(BX=NucL(*}5Idh$@4T%yS9W4fI8}jlQ9bEvx16-A*n29k_VV#+kb>G^0 z+w9PM$N!~x7_A0YjpTBAA9s{d`N|~o#_66|n0uga|qj8%PZSFwO%MGGq6O)Z}mSt@`@<_wV1sT3bM8xIrU1k0nE6 zV^OeqWn^RmA2Z*kqoc!T(EJ0}yz;!_r4R|!UHO|r6qKEphX!CbT!#;XRcj;plECFm zr>fa+-MR%)bTisK?KF=*{JE>O^()kl8`TIHkYfI0G>3&4XlD9<(f{|{ zJGv%_!w`_eMAYZ>U=oR{sy=SGJc^S!Q#1y70MO1B=2zP5Jr7pofB*hXtJHuetpB7I z2oZ}x8(Q#FuAfIGH*02z34~&m+<6Ik6#^N#VrX$XKQ~iu`2=eIKWLpprrH4%;3qrd z#!0KR-9%0QL=%Tafad&b@y9tiKNr}W21@e^M#q5sK}gK6uS@nN-i!Z&DCS_oVBLXh?9vgcz z2~}KL`W`O8#lzbLIXK6NJUt`h7fcU)`0!!p;NYgU%ppsHnheo%^$f0rvKSf>A)LhT zZUTiMeOJH&@=3E6vOm7IK=K@ zJPobCIx}Ad0v82y;gqm)@oXgtkhZX&^+YoZ4JTGqR8WR@0OXv{3_vWT!?>aNr&7>6 zM9;2()KR_u=I1A8=^8o)>f5h0C0Z&+M@Q69{<9T|?5r%Y9L3Dwo6Dg%bO3F*owl-K za`OOywJ0Q0Fc-ooFByw<-~#}_qE{0fr@teC&TR;98*=kfsUksP5fbTarUPjY&fy^5 ziiqUsV|V(STime&=N%MvkOM$oU-&-Q4+E&*wd-7V2W16dmevz#v80#8aUU+i#=-gC z@gB0;=Ip=}h8&vw9#N3E(rU}eA?=LqZb2!6Db3lnwFj>uSeaQ_oBR78iHH5^>7k;b zL9No1ftU>Kcn|Z1w{3vuJh0?Dk-=;`T3%Ypxx6-n$iqAHbV|CntCBhASNzD|Qdd(; z>pP{mJ;BLrO;Z>pz&QpzJ^iZ>3-^J}CYWJ2P>KUjx|Jm%)bXC>X66DwukLu-0Aw2r zXo693sCgY|GgDJ38Vv$&@ketV{qwx$$J?8&mr3OHrxXW2>?sl`zz>q#i_W@ct}8G2 zu6+4cwwn&mnn_x6dsd^^gTyTEu-Yw2!N(A8>MRpe(eEjn7%34sIV@m6Xy5~Y^Q$5j z3?0GkMZ;Jq2q%Z5Iybf%45@zHo=%WS;GSJs5rd)!G3cDO9U6*-1W#8>A0wbw{R9&N zP|n-`%i{I&@_NkUu%WnlU3rq!_Qi>`h0(8O4#gM-Fe|I8!NR%8^Wvf+UD(@?8)J`N z6vmV}Y^sA^xiVTv3IjdlJUmYz*e@3ER$Z)GPHgV&m0{oYgb9L^)6?wWEhzZpbaW3PoD|UcAtS3R>m+wO zjoo}?g(o6&4@#@D3u_SvPDzcoD168xS?)!tLbBi>d@zHCfguCJ?hKy*p!12KAVLk{#Hh~;Ek@={{kIkxRw9_ literal 12913 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 Mxb(ApQ5~=U1DGP-VE_OC diff --git a/examples/compiled/line_month.svg b/examples/compiled/line_month.svg index f8317db5c3..4471a09837 100644 --- a/examples/compiled/line_month.svg +++ b/examples/compiled/line_month.svg @@ -1 +1 @@ -JanFebMarAprMayJunJulAugSepOctNovDecdate (month)010203040506070Mean of temp \ No newline at end of file +JanFebMarAprMayJunJulAugSepOctNovDecdate (month)0510152025Mean of temp_max \ No newline at end of file diff --git a/examples/compiled/line_month.vg.json b/examples/compiled/line_month.vg.json index 9d5edfe573..8e1a0c4e18 100644 --- a/examples/compiled/line_month.vg.json +++ b/examples/compiled/line_month.vg.json @@ -8,7 +8,7 @@ "data": [ { "name": "source_0", - "url": "data/seattle-temps.csv", + "url": "data/seattle-weather.csv", "format": {"type": "csv", "parse": {"date": "date"}}, "transform": [ { @@ -21,8 +21,8 @@ "type": "aggregate", "groupby": ["month_date"], "ops": ["mean"], - "fields": ["temp"], - "as": ["mean_temp"] + "fields": ["temp_max"], + "as": ["mean_temp_max"] } ] } @@ -39,12 +39,12 @@ "interpolate": {"value": "monotone"}, "stroke": {"value": "#4c78a8"}, "description": { - "signal": "\"date (month)\" + \": \" + (timeFormat(datum[\"month_date\"], timeUnitSpecifier([\"month\"], {\"year-month\":\"%b %Y \",\"year-month-date\":\"%b %d, %Y \"}))) + \"; \" + \"Mean of temp\" + \": \" + (format(datum[\"mean_temp\"], \"\"))" + "signal": "\"date (month)\" + \": \" + (timeFormat(datum[\"month_date\"], timeUnitSpecifier([\"month\"], {\"year-month\":\"%b %Y \",\"year-month-date\":\"%b %d, %Y \"}))) + \"; \" + \"Mean of temp_max\" + \": \" + (format(datum[\"mean_temp_max\"], \"\"))" }, "x": {"scale": "x", "field": "month_date"}, - "y": {"scale": "y", "field": "mean_temp"}, + "y": {"scale": "y", "field": "mean_temp_max"}, "defined": { - "signal": "isValid(datum[\"month_date\"]) && isFinite(+datum[\"month_date\"]) && isValid(datum[\"mean_temp\"]) && isFinite(+datum[\"mean_temp\"])" + "signal": "isValid(datum[\"month_date\"]) && isFinite(+datum[\"month_date\"]) && isValid(datum[\"mean_temp_max\"]) && isFinite(+datum[\"mean_temp_max\"])" } } } @@ -60,7 +60,7 @@ { "name": "y", "type": "linear", - "domain": {"data": "source_0", "field": "mean_temp"}, + "domain": {"data": "source_0", "field": "mean_temp_max"}, "range": [{"signal": "height"}, 0], "nice": true, "zero": true @@ -110,7 +110,7 @@ "scale": "y", "orient": "left", "grid": false, - "title": "Mean of temp", + "title": "Mean of temp_max", "labelOverlap": true, "tickCount": {"signal": "ceil(height/40)"}, "zindex": 0 diff --git a/examples/compiled/line_month_center_band.png b/examples/compiled/line_month_center_band.png index 668a8330e98b36440d561a5c3a6329c9a3789578..189e8a7e6df8589352a378bcc8e3948864e37cc8 100644 GIT binary patch literal 13603 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 literal 12719 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 (month)010203040506070Mean of temp \ No newline at end of file +JanFebMarAprMayJunJulAugSepOctNovDecJandate (month)0510152025Mean of temp_max \ No newline at end of file diff --git a/examples/compiled/line_month_center_band.vg.json b/examples/compiled/line_month_center_band.vg.json index e505798a7a..9e6e9c2414 100644 --- a/examples/compiled/line_month_center_band.vg.json +++ b/examples/compiled/line_month_center_band.vg.json @@ -9,7 +9,7 @@ "data": [ { "name": "source_0", - "url": "data/seattle-temps.csv", + "url": "data/seattle-weather.csv", "format": {"type": "csv", "parse": {"date": "date"}}, "transform": [ { @@ -22,8 +22,8 @@ "type": "aggregate", "groupby": ["month_date", "month_date_end"], "ops": ["mean"], - "fields": ["temp"], - "as": ["mean_temp"] + "fields": ["temp_max"], + "as": ["mean_temp_max"] } ] } @@ -40,14 +40,14 @@ "interpolate": {"value": "monotone"}, "stroke": {"value": "#4c78a8"}, "description": { - "signal": "\"date (month)\" + \": \" + (timeFormat(datum[\"month_date\"], timeUnitSpecifier([\"month\"], {\"year-month\":\"%b %Y \",\"year-month-date\":\"%b %d, %Y \"}))) + \"; \" + \"Mean of temp\" + \": \" + (format(datum[\"mean_temp\"], \"\"))" + "signal": "\"date (month)\" + \": \" + (timeFormat(datum[\"month_date\"], timeUnitSpecifier([\"month\"], {\"year-month\":\"%b %Y \",\"year-month-date\":\"%b %d, %Y \"}))) + \"; \" + \"Mean of temp_max\" + \": \" + (format(datum[\"mean_temp_max\"], \"\"))" }, "x": { "signal": "scale(\"x\", 0.5 * datum[\"month_date\"] + 0.5 * datum[\"month_date_end\"])" }, - "y": {"scale": "y", "field": "mean_temp"}, + "y": {"scale": "y", "field": "mean_temp_max"}, "defined": { - "signal": "isValid(datum[\"month_date\"]) && isFinite(+datum[\"month_date\"]) && isValid(datum[\"mean_temp\"]) && isFinite(+datum[\"mean_temp\"])" + "signal": "isValid(datum[\"month_date\"]) && isFinite(+datum[\"month_date\"]) && isValid(datum[\"mean_temp_max\"]) && isFinite(+datum[\"mean_temp_max\"])" } } } @@ -66,7 +66,7 @@ { "name": "y", "type": "linear", - "domain": {"data": "source_0", "field": "mean_temp"}, + "domain": {"data": "source_0", "field": "mean_temp_max"}, "range": [{"signal": "height"}, 0], "nice": true, "zero": true @@ -116,7 +116,7 @@ "scale": "y", "orient": "left", "grid": false, - "title": "Mean of temp", + "title": "Mean of temp_max", "labelOverlap": true, "tickCount": {"signal": "ceil(height/40)"}, "zindex": 0 diff --git a/examples/compiled/point_dot_timeunit_color.png b/examples/compiled/point_dot_timeunit_color.png index b6b297694f5e38f5c2a36739c3cd28ec6fab1abb..2e14731941a2d5beaec9cbc7f6fc73c7f263b0b7 100644 GIT binary patch literal 10246 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 DkHSRy literal 10137 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 MSyh=Lsi*$`2Vo)#)&Kwi diff --git a/examples/compiled/point_dot_timeunit_color.svg b/examples/compiled/point_dot_timeunit_color.svg index 2b59bd20eb..52e22f3013 100644 --- a/examples/compiled/point_dot_timeunit_color.svg +++ b/examples/compiled/point_dot_timeunit_color.svg @@ -1 +1 @@ -010203040506070Mean of tempJan 2010Apr 2010Jul 2010Oct 2010date (year-month) \ No newline at end of file +051015202530Mean of temp_maxJan 2012Dec 2015date (year-month) \ No newline at end of file diff --git a/examples/compiled/point_dot_timeunit_color.vg.json b/examples/compiled/point_dot_timeunit_color.vg.json index c5ed0beaa4..ca59d5211f 100644 --- a/examples/compiled/point_dot_timeunit_color.vg.json +++ b/examples/compiled/point_dot_timeunit_color.vg.json @@ -8,7 +8,7 @@ "data": [ { "name": "source_0", - "url": "data/seattle-temps.csv", + "url": "data/seattle-weather.csv", "format": {"type": "csv", "parse": {"date": "date"}}, "transform": [ { @@ -21,12 +21,12 @@ "type": "aggregate", "groupby": ["yearmonth_date"], "ops": ["mean"], - "fields": ["temp"], - "as": ["mean_temp"] + "fields": ["temp_max"], + "as": ["mean_temp_max"] }, { "type": "filter", - "expr": "(isDate(datum[\"yearmonth_date\"]) || (isValid(datum[\"yearmonth_date\"]) && isFinite(+datum[\"yearmonth_date\"]))) && isValid(datum[\"mean_temp\"]) && isFinite(+datum[\"mean_temp\"])" + "expr": "(isDate(datum[\"yearmonth_date\"]) || (isValid(datum[\"yearmonth_date\"]) && isFinite(+datum[\"yearmonth_date\"]))) && isValid(datum[\"mean_temp_max\"]) && isFinite(+datum[\"mean_temp_max\"])" } ] } @@ -43,9 +43,9 @@ "stroke": {"scale": "color", "field": "yearmonth_date"}, "ariaRoleDescription": {"value": "point"}, "description": { - "signal": "\"date (year-month)\" + \": \" + (timeFormat(datum[\"yearmonth_date\"], timeUnitSpecifier([\"year\",\"month\"], {\"year-month\":\"%b %Y \",\"year-month-date\":\"%b %d, %Y \"}))) + \"; \" + \"Mean of temp\" + \": \" + (format(datum[\"mean_temp\"], \"\"))" + "signal": "\"date (year-month)\" + \": \" + (timeFormat(datum[\"yearmonth_date\"], timeUnitSpecifier([\"year\",\"month\"], {\"year-month\":\"%b %Y \",\"year-month-date\":\"%b %d, %Y \"}))) + \"; \" + \"Mean of temp_max\" + \": \" + (format(datum[\"mean_temp_max\"], \"\"))" }, - "x": {"scale": "x", "field": "mean_temp"}, + "x": {"scale": "x", "field": "mean_temp_max"}, "y": {"signal": "height", "mult": 0.5} } } @@ -55,7 +55,7 @@ { "name": "x", "type": "linear", - "domain": {"data": "source_0", "field": "mean_temp"}, + "domain": {"data": "source_0", "field": "mean_temp_max"}, "range": [0, {"signal": "width"}], "nice": true, "zero": true @@ -86,7 +86,7 @@ "scale": "x", "orient": "bottom", "grid": false, - "title": "Mean of temp", + "title": "Mean of temp_max", "labelFlush": true, "labelOverlap": true, "tickCount": {"signal": "ceil(width/40)"}, diff --git a/examples/compiled/rect_heatmap_weather.png b/examples/compiled/rect_heatmap_weather.png index e48e7cb1d9c58336e4f5747b14bf0741e3e26327..802973ad737ad0815607021642af9fbcab7dda63 100644 GIT binary patch literal 16425 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 Daily Max Temperature (F) in Seattle, WA12345678910111213141516171819202122232425262728293031DayJanFebMarAprMayJunJulAugSepOctNovDecMonth \ No newline at end of file +536Daily Max Temperatures (C) in Seattle, WA12345678910111213141516171819202122232425262728293031DayJanFebMarAprMayJunJulAugSepOctNovDecMonth \ No newline at end of file diff --git a/examples/compiled/rect_heatmap_weather.vg.json b/examples/compiled/rect_heatmap_weather.vg.json index ea34e28d47..96c61dde40 100644 --- a/examples/compiled/rect_heatmap_weather.vg.json +++ b/examples/compiled/rect_heatmap_weather.vg.json @@ -3,15 +3,18 @@ "background": "white", "padding": 5, "title": { - "text": "2010 Daily Max Temperature (F) in Seattle, WA", + "text": "Daily Max Temperatures (C) in Seattle, WA", "frame": "group" }, "style": "cell", "data": [ { "name": "source_0", - "url": "data/seattle-temps.csv", - "format": {"type": "csv", "parse": {"date": "date", "temp": "number"}}, + "url": "data/seattle-weather.csv", + "format": { + "type": "csv", + "parse": {"date": "date", "temp_max": "number"} + }, "transform": [ { "field": "date", @@ -29,12 +32,12 @@ "type": "aggregate", "groupby": ["date_date", "month_date"], "ops": ["max"], - "fields": ["temp"], - "as": ["max_temp"] + "fields": ["temp_max"], + "as": ["max_temp_max"] }, { "type": "filter", - "expr": "isValid(datum[\"max_temp\"]) && isFinite(+datum[\"max_temp\"])" + "expr": "isValid(datum[\"max_temp_max\"]) && isFinite(+datum[\"max_temp_max\"])" } ] } @@ -53,9 +56,9 @@ "from": {"data": "source_0"}, "encode": { "update": { - "fill": {"scale": "color", "field": "max_temp"}, + "fill": {"scale": "color", "field": "max_temp_max"}, "description": { - "signal": "\"Day\" + \": \" + (timeFormat(datum[\"date_date\"], '%e')) + \"; \" + \"Month\" + \": \" + (timeFormat(datum[\"month_date\"], timeUnitSpecifier([\"month\"], {\"year-month\":\"%b %Y \",\"year-month-date\":\"%b %d, %Y \"}))) + \"; \" + \"Max of temp\" + \": \" + (format(datum[\"max_temp\"], \"\"))" + "signal": "\"Day\" + \": \" + (timeFormat(datum[\"date_date\"], '%e')) + \"; \" + \"Month\" + \": \" + (timeFormat(datum[\"month_date\"], timeUnitSpecifier([\"month\"], {\"year-month\":\"%b %Y \",\"year-month-date\":\"%b %d, %Y \"}))) + \"; \" + \"Max of temp_max\" + \": \" + (format(datum[\"max_temp_max\"], \"\"))" }, "x": {"scale": "x", "field": "date_date"}, "width": {"scale": "x", "band": 1}, @@ -85,7 +88,7 @@ { "name": "color", "type": "linear", - "domain": {"data": "source_0", "field": "max_temp"}, + "domain": {"data": "source_0", "field": "max_temp_max"}, "range": "heatmap", "interpolate": "hcl", "zero": false