From f79b358c92c5b3870200cd8398e588239c52fe04 Mon Sep 17 00:00:00 2001 From: Kai Volland Date: Thu, 14 Mar 2019 13:45:37 +0100 Subject: [PATCH] Replaces regularshape.tests.js with new tests Transforms the old rendering tests for the regularshape to the new rendering test approach. --- .../cases/regularshape-style/expected.png | Bin 0 -> 6292 bytes rendering/cases/regularshape-style/main.js | 114 +++++++++++++ .../regularshape-canvas-default-style.png | Bin 1035 -> 0 bytes .../expected/regularshape-canvas-linedash.png | Bin 819 -> 0 bytes .../regularshape-canvas-linedashoffset.png | Bin 831 -> 0 bytes .../ol/style/expected/regularshape-canvas.png | Bin 1239 -> 0 bytes test/rendering/ol/style/regularshape.test.js | 150 ------------------ 7 files changed, 114 insertions(+), 150 deletions(-) create mode 100644 rendering/cases/regularshape-style/expected.png create mode 100644 rendering/cases/regularshape-style/main.js delete mode 100644 test/rendering/ol/style/expected/regularshape-canvas-default-style.png delete mode 100644 test/rendering/ol/style/expected/regularshape-canvas-linedash.png delete mode 100644 test/rendering/ol/style/expected/regularshape-canvas-linedashoffset.png delete mode 100644 test/rendering/ol/style/expected/regularshape-canvas.png delete mode 100644 test/rendering/ol/style/regularshape.test.js diff --git a/rendering/cases/regularshape-style/expected.png b/rendering/cases/regularshape-style/expected.png new file mode 100644 index 0000000000000000000000000000000000000000..b89511eef3baa284742094d4968fbe53f68db482 GIT binary patch literal 6292 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 literal 0 HcmV?d00001 diff --git a/rendering/cases/regularshape-style/main.js b/rendering/cases/regularshape-style/main.js new file mode 100644 index 0000000000..9d98bcd573 --- /dev/null +++ b/rendering/cases/regularshape-style/main.js @@ -0,0 +1,114 @@ +import Feature from '../../../src/ol/Feature.js'; +import Point from '../../../src/ol/geom/Point.js'; +import Map from '../../../src/ol/Map.js'; +import View from '../../../src/ol/View.js'; +import VectorLayer from '../../../src/ol/layer/Vector.js'; +import VectorSource from '../../../src/ol/source/Vector.js'; +import Fill from '../../../src/ol/style/Fill.js'; +import RegularShape from '../../../src/ol/style/RegularShape.js'; +import Style from '../../../src/ol/style/Style.js'; +import Stroke from '../../../src/ol/style/Stroke.js'; + +const vectorSource = new VectorSource(); +function createFeatures(stroke, fill, offSet = [0, 0]) { + let feature; + feature = new Feature({ + geometry: new Point([-15 + offSet[0], 15 + offSet[1]]) + }); + // square + feature.setStyle(new Style({ + image: new RegularShape({ + fill: fill, + stroke: stroke, + points: 4, + radius: 10, + angle: Math.PI / 4 + }) + })); + vectorSource.addFeature(feature); + + feature = new Feature({ + geometry: new Point([8 + offSet[0], 15 + offSet[1]]) + }); + // triangle + feature.setStyle(new Style({ + image: new RegularShape({ + fill: fill, + stroke: stroke, + points: 3, + radius: 10, + rotation: Math.PI / 4, + angle: 0 + }) + })); + vectorSource.addFeature(feature); + + feature = new Feature({ + geometry: new Point([-10 + offSet[0], -8 + offSet[1]]) + }); + // star + feature.setStyle(new Style({ + image: new RegularShape({ + fill: fill, + stroke: stroke, + points: 5, + radius: 10, + radius2: 4, + angle: 0 + }) + })); + vectorSource.addFeature(feature); + + feature = new Feature({ + geometry: new Point([12 + offSet[0], -8 + offSet[1]]) + }); + // cross + feature.setStyle(new Style({ + image: new RegularShape({ + fill: fill, + stroke: stroke, + points: 4, + radius: 10, + radius2: 0, + angle: 0 + }) + })); + vectorSource.addFeature(feature); +} + +createFeatures( + new Stroke({width: 2}), + new Fill({color: 'red'}) +); +createFeatures( + new Stroke({ + lineDash: [10, 5] + }), + null, + [50, 50] +); +createFeatures( + new Stroke({ + lineDash: [10, 5], + lineDashOffset: 5 + }), + null, + [-50, -50] +); + +createFeatures(new Stroke(), new Fill(), [50, -50]); + +const vectorLayer = new VectorLayer({ + source: vectorSource +}); + +new Map({ + target: 'map', + layers: [vectorLayer], + view: new View({ + center: [0, 0], + resolution: 1 + }) +}); + +render(); diff --git a/test/rendering/ol/style/expected/regularshape-canvas-default-style.png b/test/rendering/ol/style/expected/regularshape-canvas-default-style.png deleted file mode 100644 index 51e191f943e7e55eec290459271cc3b2638ce332..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1035 zcmV+m1oZofP)wbS-a?2&9ykuZPgyb?Xa8DEiZz3tgfPp9jWuTaek}yyrB1#7CBbNa& zFu=eqM9BTFpVro6J9|HC?Y*CKc5mljyK{DXt!MqeYyEHQ|7@^@$c8P1!#K!J*l`B9 zZSmO*^CnH%3V&id?19hwp4|o66Cd?WnDG17Wx=0joIjej5C3fL;Wz;Y<18GDkEcDm z3$hnJL{6nue#ZXzrg37{`VFVy5FCLMkxd;zJ&Y^y>oS4tj30134#cTA61(G2Y>z(> zQ~e9S;11l}w?RXnNK7tvepFHLY;3}Dhy_I1oJ#b_|KmOzbGigCm-!QUh6LFLH(_5K zg9D1W#EG-xeeyfr!x{LXZ}5;HS^GRZR(3nz6OC#m!1v(Rnus_wNR-};2Wqu1<3|2* z3vREOyBZ*~!n}(c@bof)w8G>>-o{DzcG*B$V3JrL!gVEF_p+>(X>}E;@tNeBtMFhi zK^d?XAT=kG{Bbc}S$2?VFezD{Ej3mx$A2>ETGU!AnOPFyow%*m(L>uct&|F{m71q| zC(6M0OZJ|n`t8Cb38wJ85YM$JF<#r`E|S8nRZ`r|0x?==1e37)W{Fm*uc~F4Zis=o zANS!JGl&so`Tv56k zyWsnhz+z^Ll2rqF9Y=SxezkN)mJTGolZIPbIf?6|PrmPmN3cUj>tx{z@I}c1X{P0q ze2~ANHWDuEMAFKM&8LP+Zz>N?L6^Ug{N4?Z-*p@`n~+aBCTX^%cFP8|$ihIf=$WOJ z)2c*Q;he}hc&3G7h^Vz2-YQMDmIM`3`=oRjb8T&vg`P-v@${v#v+2?HNxB|s%3Zd? zz~?J-PA$j_rGNatUh6a^iB|blvE4bXbf1QU?G?m1v*+VK^D3*6Cnv~RVr=_OcFOLwFwH^ z3_-bYt001_2qeXwU@uU)Zc&Tp3^QEsb^ibVJ?F~E{lekQ+;h(JoF8+}bD#4JeP#!P zSW>YK7Vtlu`jvR58$-MCSH(7tTUgMILk!_*Jc}`Wif{0XF2&U0A1rRTb`US&Bb>&M z_#9v0h!C@?j=>>((r`0XgbazJIE3XbW1Ddjui+IuAq1YnXLUETIBlp2orFAwrPzWu zaTX`=Mw_|wP2CMb%t`EO`Fuul3z>rhIEU}>6+XaQ6>V+$`7k4A1314Dk3B!v-?$j&B)Q@JB zSy#g7185hTYlqvJIHy|n`=^GNGBI7uGI2i^bz$#5=BoA{$>DTT%s4J!QwEz4jd79A zoEM4atmajGD6-~RPu0Y-Pdl#4mzqrH=K?l6vKH5|w}9>c3fSz(C48Iu-1JPy3h`yQ zJoPIw+wYl>gQ83$^#?QC@0pOx;-MtCh^U`>Zw?t7P?};PxASUpB246*me2;zU=K)b!zmxjOqqHy0>y~0d=9R^cM9 z;q}yCOrMY7-32ATIMtywG9J2KzS;Zq>C>n8{10!wsp$IrzG?sf002ovPDHLkV1lSUk+=W= diff --git a/test/rendering/ol/style/expected/regularshape-canvas-linedashoffset.png b/test/rendering/ol/style/expected/regularshape-canvas-linedashoffset.png deleted file mode 100644 index 3723123e3d2052c5439767c69ab93889115142d2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 831 zcmV-F1Hk-=P)_Z1-6NT z+SH9>OoRgG8T3Ksg5*@Dg9RDUJe*I@$pVKeq%KX%}I++W4f z8eGmC#N}jPmAi1a82H;bi*N8QPGJ{L3;cqcrs?ZTH<`qoW8(MSB3NcSrw41{1IUP>mc#h!!m4@D`SjdLT_u>)ZHWvj)FuChQiu z(1OpN%wZ94w%~iQ1)n{61SiEQN7D>d2(bt*h^=dr3|$C(Dne$Hj6}#2VnuF}#)Ndl zrhg`thw)e{&)`@e+i5)1Wjn3ZZljz_qE=5!VKFX-&v- zl0XE5_(V6pUkg#9E(8(O5fR@QaUn#+D1re+jadmo6a;rZ7J_b! zBD!#+Zp4*Qgakz}y73h>Ml|u!8TqPjjdyywt8R5wb&nwjn(FGl_tyFE`OoWCheJd< z{{tM$fxpZ2jDeg7TwgY!;QzOPPixH2ryco&cN-T&ES5 z!TN*HnStqPm=fJS_yu?rc%hO-G)a|hb*u;qfGi6NoCq8XTm)PKcz;<34y=YXQ^2Xf zrQwgWfIEQi;d9`2de@<{$RZ5_ks8wGYT%rpryy1y32P4m7luF90oMeSrw7k|5!ejf zy|5!#?7K+;Sqr=&fGJqlh3?rfC7&(;t^zdGx#23`VtE|c+KX131FiN?3W)T15V+|$ z;7;If;7s5*;Ftofb_ZI04EwuqAMjF{+qOw9pM8rFXgSQ@6GBl+Ao(KjaW@!CHUhgQ z4P+k73YguH0HzCU1D*!CB7w~SGHO37j$uc`lE@W9y|F{?Uaw!5S1fvO_2c80chu45xQ$S3@BDr2e zX=XNm6@Ct`VqUaTDV0S&Vt7mmk@?En-%o{FYbY4Y-P?dq;78yF;Ge_=Z;sfHWMHOY*7|)9@DDr-JOs?8>a$cj#0*T>$R7fT z*8%fmk}MSWJX%tD8VEPHLI`w|i({?_fFbSr37=k=ebjG-?r*RaXzs z{KS&|W;<%AGIV*u5S(7ekHvdGVoe3vD3H<`=j(v5LdZ&ukc|S-B0BVp+w1O2p2GT1cHfJLd^eQp!!yaCycqTOx0XqE@GHN>*8< zn0p?B8hKKtM*X5iJb;U~-3P=OzwT-OFf>`>OabBo^Hei=$hm$oiI_|Zs3iWBQbvpT zQouw0(0mqJ#Enj}NWMyD8R_Mheo;eB5H2YS57VwuXCL&CthVxKTt}BmDlRa$S_ePB zH>*M*8;GSfx`T&qB&$~IpxT8BhFqTb@m3N2qP z`64ky-$4v4BzyR?RUqze7KW8h?_AbWTV*$OV9Q+ZZB#B1(^7O_Fs3yiGR8!nOPm|> z-xlPY@S{CSf60=9sx=^S?@`w5#JOVB9;G!PdHhd3x604QviP22g1#}W0U1G;T2l@g zAUOjnSv0joskO!9n0y$>ICi