@pixwel/pixwel-sdk 1.1.8 → 1.1.10
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/coverage/clover.xml +138 -132
- package/coverage/coverage-final.json +8 -8
- package/coverage/lcov-report/Ass.js.html +212 -216
- package/coverage/lcov-report/Asset.js.html +25 -29
- package/coverage/lcov-report/Filename.js.html +257 -261
- package/coverage/lcov-report/Ingest.js.html +608 -600
- package/coverage/lcov-report/IngestFile.js.html +8 -12
- package/coverage/lcov-report/Order.js.html +51 -55
- package/coverage/lcov-report/Srt.js.html +112 -116
- package/coverage/lcov-report/Sub.js.html +40 -44
- package/coverage/lcov-report/TimeFormat.js.html +61 -65
- package/coverage/lcov-report/base.css +3 -14
- package/coverage/lcov-report/index.html +33 -37
- package/coverage/lcov.info +285 -279
- package/dist/src/Filename.js +10 -10
- package/dist/src/Ingest.js +4 -0
- package/package.json +1 -1
- package/src/Filename.js +10 -10
- package/src/Ingest.js +4 -0
- package/test/Ingest.spec.js +12 -0
|
@@ -20,480 +20,491 @@
|
|
|
20
20
|
</h1>
|
|
21
21
|
<div class='clearfix'>
|
|
22
22
|
<div class='fl pad1y space-right2'>
|
|
23
|
-
<span class="strong">
|
|
23
|
+
<span class="strong">83.1% </span>
|
|
24
24
|
<span class="quiet">Statements</span>
|
|
25
|
-
<span class='fraction'>
|
|
25
|
+
<span class='fraction'>118/142</span>
|
|
26
26
|
</div>
|
|
27
27
|
<div class='fl pad1y space-right2'>
|
|
28
|
-
<span class="strong">
|
|
28
|
+
<span class="strong">82.03% </span>
|
|
29
29
|
<span class="quiet">Branches</span>
|
|
30
|
-
<span class='fraction'>
|
|
30
|
+
<span class='fraction'>105/128</span>
|
|
31
31
|
</div>
|
|
32
32
|
<div class='fl pad1y space-right2'>
|
|
33
|
-
<span class="strong">
|
|
33
|
+
<span class="strong">100% </span>
|
|
34
34
|
<span class="quiet">Functions</span>
|
|
35
|
-
<span class='fraction'>
|
|
35
|
+
<span class='fraction'>4/4</span>
|
|
36
36
|
</div>
|
|
37
37
|
<div class='fl pad1y space-right2'>
|
|
38
|
-
<span class="strong">
|
|
38
|
+
<span class="strong">83.1% </span>
|
|
39
39
|
<span class="quiet">Lines</span>
|
|
40
|
-
<span class='fraction'>
|
|
40
|
+
<span class='fraction'>118/142</span>
|
|
41
41
|
</div>
|
|
42
42
|
</div>
|
|
43
|
-
<p class="quiet">
|
|
44
|
-
Press <em>n</em> or <em>j</em> to go to the next uncovered block, <em>b</em>, <em>p</em> or <em>k</em> for the previous block.
|
|
45
|
-
</p>
|
|
46
43
|
</div>
|
|
47
|
-
<div class='status-line
|
|
44
|
+
<div class='status-line high'></div>
|
|
48
45
|
<pre><table class="coverage">
|
|
49
|
-
<tr><td class="line-count quiet"
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
|
|
283
|
-
|
|
284
|
-
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
|
|
289
|
-
|
|
290
|
-
|
|
291
|
-
|
|
292
|
-
|
|
293
|
-
|
|
294
|
-
|
|
295
|
-
|
|
296
|
-
|
|
297
|
-
|
|
298
|
-
|
|
299
|
-
|
|
300
|
-
|
|
301
|
-
|
|
302
|
-
|
|
303
|
-
|
|
304
|
-
|
|
305
|
-
|
|
306
|
-
|
|
307
|
-
|
|
308
|
-
|
|
309
|
-
|
|
310
|
-
|
|
311
|
-
|
|
312
|
-
|
|
313
|
-
|
|
314
|
-
|
|
315
|
-
|
|
316
|
-
|
|
317
|
-
|
|
318
|
-
|
|
319
|
-
|
|
320
|
-
|
|
321
|
-
|
|
322
|
-
|
|
323
|
-
|
|
324
|
-
|
|
325
|
-
|
|
326
|
-
|
|
327
|
-
|
|
328
|
-
|
|
329
|
-
|
|
330
|
-
|
|
331
|
-
|
|
332
|
-
|
|
333
|
-
|
|
334
|
-
|
|
335
|
-
|
|
336
|
-
|
|
337
|
-
|
|
338
|
-
|
|
339
|
-
|
|
340
|
-
|
|
341
|
-
|
|
342
|
-
|
|
343
|
-
|
|
344
|
-
|
|
345
|
-
|
|
346
|
-
|
|
347
|
-
|
|
348
|
-
|
|
349
|
-
|
|
350
|
-
|
|
351
|
-
|
|
352
|
-
|
|
353
|
-
|
|
354
|
-
|
|
355
|
-
|
|
356
|
-
|
|
357
|
-
|
|
358
|
-
|
|
359
|
-
|
|
360
|
-
|
|
361
|
-
|
|
362
|
-
|
|
363
|
-
|
|
364
|
-
|
|
365
|
-
|
|
366
|
-
|
|
367
|
-
|
|
368
|
-
|
|
369
|
-
|
|
370
|
-
|
|
371
|
-
|
|
372
|
-
|
|
373
|
-
|
|
374
|
-
|
|
375
|
-
|
|
376
|
-
|
|
377
|
-
|
|
378
|
-
|
|
379
|
-
|
|
380
|
-
|
|
381
|
-
|
|
382
|
-
|
|
383
|
-
|
|
384
|
-
|
|
385
|
-
|
|
386
|
-
|
|
387
|
-
|
|
388
|
-
|
|
389
|
-
|
|
390
|
-
|
|
391
|
-
|
|
392
|
-
|
|
46
|
+
<tr><td class="line-count quiet">1
|
|
47
|
+
2
|
|
48
|
+
3
|
|
49
|
+
4
|
|
50
|
+
5
|
|
51
|
+
6
|
|
52
|
+
7
|
|
53
|
+
8
|
|
54
|
+
9
|
|
55
|
+
10
|
|
56
|
+
11
|
|
57
|
+
12
|
|
58
|
+
13
|
|
59
|
+
14
|
|
60
|
+
15
|
|
61
|
+
16
|
|
62
|
+
17
|
|
63
|
+
18
|
|
64
|
+
19
|
|
65
|
+
20
|
|
66
|
+
21
|
|
67
|
+
22
|
|
68
|
+
23
|
|
69
|
+
24
|
|
70
|
+
25
|
|
71
|
+
26
|
|
72
|
+
27
|
|
73
|
+
28
|
|
74
|
+
29
|
|
75
|
+
30
|
|
76
|
+
31
|
|
77
|
+
32
|
|
78
|
+
33
|
|
79
|
+
34
|
|
80
|
+
35
|
|
81
|
+
36
|
|
82
|
+
37
|
|
83
|
+
38
|
|
84
|
+
39
|
|
85
|
+
40
|
|
86
|
+
41
|
|
87
|
+
42
|
|
88
|
+
43
|
|
89
|
+
44
|
|
90
|
+
45
|
|
91
|
+
46
|
|
92
|
+
47
|
|
93
|
+
48
|
|
94
|
+
49
|
|
95
|
+
50
|
|
96
|
+
51
|
|
97
|
+
52
|
|
98
|
+
53
|
|
99
|
+
54
|
|
100
|
+
55
|
|
101
|
+
56
|
|
102
|
+
57
|
|
103
|
+
58
|
|
104
|
+
59
|
|
105
|
+
60
|
|
106
|
+
61
|
|
107
|
+
62
|
|
108
|
+
63
|
|
109
|
+
64
|
|
110
|
+
65
|
|
111
|
+
66
|
|
112
|
+
67
|
|
113
|
+
68
|
|
114
|
+
69
|
|
115
|
+
70
|
|
116
|
+
71
|
|
117
|
+
72
|
|
118
|
+
73
|
|
119
|
+
74
|
|
120
|
+
75
|
|
121
|
+
76
|
|
122
|
+
77
|
|
123
|
+
78
|
|
124
|
+
79
|
|
125
|
+
80
|
|
126
|
+
81
|
|
127
|
+
82
|
|
128
|
+
83
|
|
129
|
+
84
|
|
130
|
+
85
|
|
131
|
+
86
|
|
132
|
+
87
|
|
133
|
+
88
|
|
134
|
+
89
|
|
135
|
+
90
|
|
136
|
+
91
|
|
137
|
+
92
|
|
138
|
+
93
|
|
139
|
+
94
|
|
140
|
+
95
|
|
141
|
+
96
|
|
142
|
+
97
|
|
143
|
+
98
|
|
144
|
+
99
|
|
145
|
+
100
|
|
146
|
+
101
|
|
147
|
+
102
|
|
148
|
+
103
|
|
149
|
+
104
|
|
150
|
+
105
|
|
151
|
+
106
|
|
152
|
+
107
|
|
153
|
+
108
|
|
154
|
+
109
|
|
155
|
+
110
|
|
156
|
+
111
|
|
157
|
+
112
|
|
158
|
+
113
|
|
159
|
+
114
|
|
160
|
+
115
|
|
161
|
+
116
|
|
162
|
+
117
|
|
163
|
+
118
|
|
164
|
+
119
|
|
165
|
+
120
|
|
166
|
+
121
|
|
167
|
+
122
|
|
168
|
+
123
|
|
169
|
+
124
|
|
170
|
+
125
|
|
171
|
+
126
|
|
172
|
+
127
|
|
173
|
+
128
|
|
174
|
+
129
|
|
175
|
+
130
|
|
176
|
+
131
|
|
177
|
+
132
|
|
178
|
+
133
|
|
179
|
+
134
|
|
180
|
+
135
|
|
181
|
+
136
|
|
182
|
+
137
|
|
183
|
+
138
|
|
184
|
+
139
|
|
185
|
+
140
|
|
186
|
+
141
|
|
187
|
+
142
|
|
188
|
+
143
|
|
189
|
+
144
|
|
190
|
+
145
|
|
191
|
+
146
|
|
192
|
+
147
|
|
193
|
+
148
|
|
194
|
+
149
|
|
195
|
+
150
|
|
196
|
+
151
|
|
197
|
+
152
|
|
198
|
+
153
|
|
199
|
+
154
|
|
200
|
+
155
|
|
201
|
+
156
|
|
202
|
+
157
|
|
203
|
+
158
|
|
204
|
+
159
|
|
205
|
+
160
|
|
206
|
+
161
|
|
207
|
+
162
|
|
208
|
+
163
|
|
209
|
+
164
|
|
210
|
+
165
|
|
211
|
+
166
|
|
212
|
+
167
|
|
213
|
+
168
|
|
214
|
+
169
|
|
215
|
+
170
|
|
216
|
+
171
|
|
217
|
+
172
|
|
218
|
+
173
|
|
219
|
+
174
|
|
220
|
+
175
|
|
221
|
+
176
|
|
222
|
+
177
|
|
223
|
+
178
|
|
224
|
+
179
|
|
225
|
+
180
|
|
226
|
+
181
|
|
227
|
+
182
|
|
228
|
+
183
|
|
229
|
+
184
|
|
230
|
+
185
|
|
231
|
+
186
|
|
232
|
+
187
|
|
233
|
+
188
|
|
234
|
+
189
|
|
235
|
+
190
|
|
236
|
+
191
|
|
237
|
+
192
|
|
238
|
+
193
|
|
239
|
+
194
|
|
240
|
+
195
|
|
241
|
+
196
|
|
242
|
+
197
|
|
243
|
+
198
|
|
244
|
+
199
|
|
245
|
+
200
|
|
246
|
+
201
|
|
247
|
+
202
|
|
248
|
+
203
|
|
249
|
+
204
|
|
250
|
+
205
|
|
251
|
+
206
|
|
252
|
+
207
|
|
253
|
+
208
|
|
254
|
+
209
|
|
255
|
+
210
|
|
256
|
+
211
|
|
257
|
+
212
|
|
258
|
+
213
|
|
259
|
+
214
|
|
260
|
+
215
|
|
261
|
+
216
|
|
262
|
+
217
|
|
263
|
+
218
|
|
264
|
+
219
|
|
265
|
+
220
|
|
266
|
+
221
|
|
267
|
+
222
|
|
268
|
+
223
|
|
269
|
+
224
|
|
270
|
+
225
|
|
271
|
+
226
|
|
272
|
+
227
|
|
273
|
+
228
|
|
274
|
+
229
|
|
275
|
+
230
|
|
276
|
+
231
|
|
277
|
+
232
|
|
278
|
+
233
|
|
279
|
+
234
|
|
280
|
+
235
|
|
281
|
+
236
|
|
282
|
+
237
|
|
283
|
+
238
|
|
284
|
+
239
|
|
285
|
+
240
|
|
286
|
+
241
|
|
287
|
+
242
|
|
288
|
+
243
|
|
289
|
+
244
|
|
290
|
+
245
|
|
291
|
+
246
|
|
292
|
+
247
|
|
293
|
+
248
|
|
294
|
+
249
|
|
295
|
+
250
|
|
296
|
+
251
|
|
297
|
+
252
|
|
298
|
+
253
|
|
299
|
+
254
|
|
300
|
+
255
|
|
301
|
+
256
|
|
302
|
+
257
|
|
303
|
+
258
|
|
304
|
+
259
|
|
305
|
+
260
|
|
306
|
+
261
|
|
307
|
+
262
|
|
308
|
+
263
|
|
309
|
+
264
|
|
310
|
+
265
|
|
311
|
+
266
|
|
312
|
+
267
|
|
313
|
+
268
|
|
314
|
+
269
|
|
315
|
+
270
|
|
316
|
+
271
|
|
317
|
+
272
|
|
318
|
+
273
|
|
319
|
+
274
|
|
320
|
+
275
|
|
321
|
+
276
|
|
322
|
+
277
|
|
323
|
+
278
|
|
324
|
+
279
|
|
325
|
+
280
|
|
326
|
+
281
|
|
327
|
+
282
|
|
328
|
+
283
|
|
329
|
+
284
|
|
330
|
+
285
|
|
331
|
+
286
|
|
332
|
+
287
|
|
333
|
+
288
|
|
334
|
+
289
|
|
335
|
+
290
|
|
336
|
+
291
|
|
337
|
+
292
|
|
338
|
+
293
|
|
339
|
+
294
|
|
340
|
+
295
|
|
341
|
+
296
|
|
342
|
+
297
|
|
343
|
+
298
|
|
344
|
+
299
|
|
345
|
+
300
|
|
346
|
+
301
|
|
347
|
+
302
|
|
348
|
+
303
|
|
349
|
+
304
|
|
350
|
+
305
|
|
351
|
+
306
|
|
352
|
+
307
|
|
353
|
+
308
|
|
354
|
+
309
|
|
355
|
+
310
|
|
356
|
+
311
|
|
357
|
+
312
|
|
358
|
+
313
|
|
359
|
+
314
|
|
360
|
+
315
|
|
361
|
+
316
|
|
362
|
+
317
|
|
363
|
+
318
|
|
364
|
+
319
|
|
365
|
+
320
|
|
366
|
+
321
|
|
367
|
+
322
|
|
368
|
+
323
|
|
369
|
+
324
|
|
370
|
+
325
|
|
371
|
+
326
|
|
372
|
+
327
|
|
373
|
+
328
|
|
374
|
+
329
|
|
375
|
+
330
|
|
376
|
+
331
|
|
377
|
+
332
|
|
378
|
+
333
|
|
379
|
+
334
|
|
380
|
+
335
|
|
381
|
+
336
|
|
382
|
+
337
|
|
383
|
+
338
|
|
384
|
+
339
|
|
385
|
+
340
|
|
386
|
+
341
|
|
387
|
+
342
|
|
388
|
+
343
|
|
389
|
+
344</td><td class="line-coverage quiet"><span class="cline-any cline-neutral"> </span>
|
|
390
|
+
<span class="cline-any cline-neutral"> </span>
|
|
391
|
+
<span class="cline-any cline-neutral"> </span>
|
|
392
|
+
<span class="cline-any cline-neutral"> </span>
|
|
393
|
+
<span class="cline-any cline-neutral"> </span>
|
|
394
|
+
<span class="cline-any cline-neutral"> </span>
|
|
395
|
+
<span class="cline-any cline-neutral"> </span>
|
|
396
|
+
<span class="cline-any cline-neutral"> </span>
|
|
397
|
+
<span class="cline-any cline-neutral"> </span>
|
|
398
|
+
<span class="cline-any cline-neutral"> </span>
|
|
399
|
+
<span class="cline-any cline-neutral"> </span>
|
|
400
|
+
<span class="cline-any cline-neutral"> </span>
|
|
401
|
+
<span class="cline-any cline-neutral"> </span>
|
|
402
|
+
<span class="cline-any cline-yes">7x</span>
|
|
403
|
+
<span class="cline-any cline-neutral"> </span>
|
|
404
|
+
<span class="cline-any cline-neutral"> </span>
|
|
405
|
+
<span class="cline-any cline-neutral"> </span>
|
|
406
|
+
<span class="cline-any cline-neutral"> </span>
|
|
407
|
+
<span class="cline-any cline-neutral"> </span>
|
|
408
|
+
<span class="cline-any cline-neutral"> </span>
|
|
409
|
+
<span class="cline-any cline-neutral"> </span>
|
|
410
|
+
<span class="cline-any cline-neutral"> </span>
|
|
411
|
+
<span class="cline-any cline-neutral"> </span>
|
|
412
|
+
<span class="cline-any cline-neutral"> </span>
|
|
413
|
+
<span class="cline-any cline-neutral"> </span>
|
|
414
|
+
<span class="cline-any cline-neutral"> </span>
|
|
415
|
+
<span class="cline-any cline-yes">7x</span>
|
|
393
416
|
<span class="cline-any cline-neutral"> </span>
|
|
417
|
+
<span class="cline-any cline-yes">7x</span>
|
|
418
|
+
<span class="cline-any cline-yes">1x</span>
|
|
394
419
|
<span class="cline-any cline-neutral"> </span>
|
|
395
420
|
<span class="cline-any cline-neutral"> </span>
|
|
421
|
+
<span class="cline-any cline-yes">6x</span>
|
|
422
|
+
<span class="cline-any cline-yes">1x</span>
|
|
396
423
|
<span class="cline-any cline-neutral"> </span>
|
|
397
424
|
<span class="cline-any cline-neutral"> </span>
|
|
398
425
|
<span class="cline-any cline-neutral"> </span>
|
|
426
|
+
<span class="cline-any cline-yes">5x</span>
|
|
427
|
+
<span class="cline-any cline-yes">1x</span>
|
|
399
428
|
<span class="cline-any cline-neutral"> </span>
|
|
429
|
+
<span class="cline-any cline-yes">4x</span>
|
|
400
430
|
<span class="cline-any cline-neutral"> </span>
|
|
401
|
-
<span class="cline-any cline-no"> </span>
|
|
402
431
|
<span class="cline-any cline-neutral"> </span>
|
|
432
|
+
<span class="cline-any cline-yes">5x</span>
|
|
403
433
|
<span class="cline-any cline-neutral"> </span>
|
|
434
|
+
<span class="cline-any cline-yes">3x</span>
|
|
435
|
+
<span class="cline-any cline-yes">3x</span>
|
|
404
436
|
<span class="cline-any cline-neutral"> </span>
|
|
437
|
+
<span class="cline-any cline-yes">1x</span>
|
|
438
|
+
<span class="cline-any cline-yes">1x</span>
|
|
405
439
|
<span class="cline-any cline-neutral"> </span>
|
|
440
|
+
<span class="cline-any cline-yes">1x</span>
|
|
441
|
+
<span class="cline-any cline-yes">1x</span>
|
|
406
442
|
<span class="cline-any cline-neutral"> </span>
|
|
443
|
+
<span class="cline-any cline-yes">1x</span>
|
|
407
444
|
<span class="cline-any cline-neutral"> </span>
|
|
408
445
|
<span class="cline-any cline-neutral"> </span>
|
|
446
|
+
<span class="cline-any cline-yes">4x</span>
|
|
409
447
|
<span class="cline-any cline-neutral"> </span>
|
|
410
448
|
<span class="cline-any cline-neutral"> </span>
|
|
411
449
|
<span class="cline-any cline-neutral"> </span>
|
|
412
450
|
<span class="cline-any cline-neutral"> </span>
|
|
413
451
|
<span class="cline-any cline-neutral"> </span>
|
|
414
|
-
<span class="cline-any cline-no"> </span>
|
|
415
452
|
<span class="cline-any cline-neutral"> </span>
|
|
416
|
-
<span class="cline-any cline-no"> </span>
|
|
417
|
-
<span class="cline-any cline-no"> </span>
|
|
418
453
|
<span class="cline-any cline-neutral"> </span>
|
|
419
454
|
<span class="cline-any cline-neutral"> </span>
|
|
420
|
-
<span class="cline-any cline-no"> </span>
|
|
421
|
-
<span class="cline-any cline-no"> </span>
|
|
422
455
|
<span class="cline-any cline-neutral"> </span>
|
|
456
|
+
<span class="cline-any cline-yes">4x</span>
|
|
423
457
|
<span class="cline-any cline-neutral"> </span>
|
|
424
458
|
<span class="cline-any cline-neutral"> </span>
|
|
425
|
-
<span class="cline-any cline-
|
|
426
|
-
<span class="cline-any cline-no"> </span>
|
|
459
|
+
<span class="cline-any cline-yes">4x</span>
|
|
427
460
|
<span class="cline-any cline-neutral"> </span>
|
|
428
|
-
<span class="cline-any cline-
|
|
461
|
+
<span class="cline-any cline-yes">4x</span>
|
|
462
|
+
<span class="cline-any cline-yes">4x</span>
|
|
463
|
+
<span class="cline-any cline-yes">4x</span>
|
|
464
|
+
<span class="cline-any cline-yes">4x</span>
|
|
465
|
+
<span class="cline-any cline-yes">3x</span>
|
|
429
466
|
<span class="cline-any cline-neutral"> </span>
|
|
430
467
|
<span class="cline-any cline-neutral"> </span>
|
|
468
|
+
<span class="cline-any cline-yes">4x</span>
|
|
469
|
+
<span class="cline-any cline-yes">4x</span>
|
|
431
470
|
<span class="cline-any cline-no"> </span>
|
|
432
471
|
<span class="cline-any cline-neutral"> </span>
|
|
433
|
-
<span class="cline-any cline-no"> </span>
|
|
434
|
-
<span class="cline-any cline-no"> </span>
|
|
435
472
|
<span class="cline-any cline-neutral"> </span>
|
|
436
|
-
<span class="cline-any cline-
|
|
437
|
-
<span class="cline-any cline-
|
|
473
|
+
<span class="cline-any cline-yes">4x</span>
|
|
474
|
+
<span class="cline-any cline-yes">4x</span>
|
|
438
475
|
<span class="cline-any cline-neutral"> </span>
|
|
439
|
-
<span class="cline-any cline-
|
|
440
|
-
<span class="cline-any cline-
|
|
476
|
+
<span class="cline-any cline-yes">2x</span>
|
|
477
|
+
<span class="cline-any cline-yes">2x</span>
|
|
441
478
|
<span class="cline-any cline-neutral"> </span>
|
|
442
479
|
<span class="cline-any cline-no"> </span>
|
|
443
|
-
<span class="cline-any cline-neutral"> </span>
|
|
444
|
-
<span class="cline-any cline-neutral"> </span>
|
|
445
480
|
<span class="cline-any cline-no"> </span>
|
|
446
481
|
<span class="cline-any cline-neutral"> </span>
|
|
447
|
-
<span class="cline-any cline-neutral"> </span>
|
|
448
|
-
<span class="cline-any cline-neutral"> </span>
|
|
449
|
-
<span class="cline-any cline-neutral"> </span>
|
|
450
|
-
<span class="cline-any cline-neutral"> </span>
|
|
451
|
-
<span class="cline-any cline-neutral"> </span>
|
|
452
|
-
<span class="cline-any cline-neutral"> </span>
|
|
453
|
-
<span class="cline-any cline-neutral"> </span>
|
|
454
|
-
<span class="cline-any cline-neutral"> </span>
|
|
455
482
|
<span class="cline-any cline-no"> </span>
|
|
456
|
-
<span class="cline-any cline-neutral"> </span>
|
|
457
|
-
<span class="cline-any cline-neutral"> </span>
|
|
458
483
|
<span class="cline-any cline-no"> </span>
|
|
459
484
|
<span class="cline-any cline-neutral"> </span>
|
|
460
485
|
<span class="cline-any cline-no"> </span>
|
|
461
486
|
<span class="cline-any cline-no"> </span>
|
|
462
|
-
<span class="cline-any cline-no"> </span>
|
|
463
|
-
<span class="cline-any cline-no"> </span>
|
|
464
|
-
<span class="cline-any cline-no"> </span>
|
|
465
487
|
<span class="cline-any cline-neutral"> </span>
|
|
466
|
-
<span class="cline-any cline-neutral"> </span>
|
|
467
|
-
<span class="cline-any cline-no"> </span>
|
|
468
488
|
<span class="cline-any cline-no"> </span>
|
|
469
489
|
<span class="cline-any cline-no"> </span>
|
|
470
490
|
<span class="cline-any cline-neutral"> </span>
|
|
471
|
-
<span class="cline-any cline-neutral"> </span>
|
|
472
491
|
<span class="cline-any cline-no"> </span>
|
|
473
492
|
<span class="cline-any cline-no"> </span>
|
|
474
493
|
<span class="cline-any cline-neutral"> </span>
|
|
475
|
-
<span class="cline-any cline-
|
|
476
|
-
<span class="cline-any cline-
|
|
494
|
+
<span class="cline-any cline-yes">4x</span>
|
|
495
|
+
<span class="cline-any cline-yes">4x</span>
|
|
496
|
+
<span class="cline-any cline-yes">4x</span>
|
|
497
|
+
<span class="cline-any cline-yes">2x</span>
|
|
477
498
|
<span class="cline-any cline-neutral"> </span>
|
|
478
|
-
<span class="cline-any cline-no"> </span>
|
|
479
|
-
<span class="cline-any cline-no"> </span>
|
|
480
499
|
<span class="cline-any cline-neutral"> </span>
|
|
481
|
-
<span class="cline-any cline-
|
|
482
|
-
<span class="cline-any cline-
|
|
500
|
+
<span class="cline-any cline-yes">4x</span>
|
|
501
|
+
<span class="cline-any cline-yes">4x</span>
|
|
483
502
|
<span class="cline-any cline-neutral"> </span>
|
|
484
|
-
<span class="cline-any cline-no"> </span>
|
|
485
|
-
<span class="cline-any cline-no"> </span>
|
|
486
503
|
<span class="cline-any cline-neutral"> </span>
|
|
487
|
-
<span class="cline-any cline-no"> </span>
|
|
488
|
-
<span class="cline-any cline-no"> </span>
|
|
489
504
|
<span class="cline-any cline-neutral"> </span>
|
|
490
|
-
<span class="cline-any cline-no"> </span>
|
|
491
|
-
<span class="cline-any cline-no"> </span>
|
|
492
505
|
<span class="cline-any cline-neutral"> </span>
|
|
493
|
-
<span class="cline-any cline-
|
|
494
|
-
<span class="cline-any cline-
|
|
495
|
-
<span class="cline-any cline-no"> </span>
|
|
496
|
-
<span class="cline-any cline-no"> </span>
|
|
506
|
+
<span class="cline-any cline-yes">2x</span>
|
|
507
|
+
<span class="cline-any cline-yes">2x</span>
|
|
497
508
|
<span class="cline-any cline-neutral"> </span>
|
|
498
509
|
<span class="cline-any cline-neutral"> </span>
|
|
499
510
|
<span class="cline-any cline-no"> </span>
|
|
@@ -502,50 +513,43 @@
|
|
|
502
513
|
<span class="cline-any cline-neutral"> </span>
|
|
503
514
|
<span class="cline-any cline-neutral"> </span>
|
|
504
515
|
<span class="cline-any cline-neutral"> </span>
|
|
505
|
-
<span class="cline-any cline-
|
|
506
|
-
<span class="cline-any cline-no"> </span>
|
|
507
|
-
<span class="cline-any cline-neutral"> </span>
|
|
508
|
-
<span class="cline-any cline-neutral"> </span>
|
|
509
|
-
<span class="cline-any cline-no"> </span>
|
|
510
|
-
<span class="cline-any cline-no"> </span>
|
|
516
|
+
<span class="cline-any cline-yes">4x</span>
|
|
511
517
|
<span class="cline-any cline-neutral"> </span>
|
|
518
|
+
<span class="cline-any cline-yes">1x</span>
|
|
519
|
+
<span class="cline-any cline-yes">1x</span>
|
|
512
520
|
<span class="cline-any cline-neutral"> </span>
|
|
521
|
+
<span class="cline-any cline-yes">1x</span>
|
|
522
|
+
<span class="cline-any cline-yes">1x</span>
|
|
513
523
|
<span class="cline-any cline-neutral"> </span>
|
|
524
|
+
<span class="cline-any cline-yes">4x</span>
|
|
525
|
+
<span class="cline-any cline-yes">2x</span>
|
|
514
526
|
<span class="cline-any cline-neutral"> </span>
|
|
515
|
-
<span class="cline-any cline-no"> </span>
|
|
516
527
|
<span class="cline-any cline-neutral"> </span>
|
|
517
|
-
<span class="cline-any cline-
|
|
518
|
-
<span class="cline-any cline-
|
|
528
|
+
<span class="cline-any cline-yes">4x</span>
|
|
529
|
+
<span class="cline-any cline-yes">1x</span>
|
|
519
530
|
<span class="cline-any cline-neutral"> </span>
|
|
520
|
-
<span class="cline-any cline-no"> </span>
|
|
521
|
-
<span class="cline-any cline-no"> </span>
|
|
522
531
|
<span class="cline-any cline-neutral"> </span>
|
|
523
|
-
<span class="cline-any cline-
|
|
524
|
-
<span class="cline-any cline-
|
|
532
|
+
<span class="cline-any cline-yes">4x</span>
|
|
533
|
+
<span class="cline-any cline-yes">1x</span>
|
|
525
534
|
<span class="cline-any cline-neutral"> </span>
|
|
526
535
|
<span class="cline-any cline-neutral"> </span>
|
|
536
|
+
<span class="cline-any cline-yes">4x</span>
|
|
527
537
|
<span class="cline-any cline-no"> </span>
|
|
528
|
-
<span class="cline-any cline-no"> </span>
|
|
529
|
-
<span class="cline-any cline-neutral"> </span>
|
|
530
538
|
<span class="cline-any cline-neutral"> </span>
|
|
531
|
-
<span class="cline-any cline-no"> </span>
|
|
532
|
-
<span class="cline-any cline-no"> </span>
|
|
533
539
|
<span class="cline-any cline-neutral"> </span>
|
|
540
|
+
<span class="cline-any cline-yes">4x</span>
|
|
534
541
|
<span class="cline-any cline-neutral"> </span>
|
|
535
542
|
<span class="cline-any cline-no"> </span>
|
|
536
543
|
<span class="cline-any cline-no"> </span>
|
|
537
544
|
<span class="cline-any cline-neutral"> </span>
|
|
538
|
-
<span class="cline-any cline-neutral"> </span>
|
|
539
|
-
<span class="cline-any cline-no"> </span>
|
|
540
|
-
<span class="cline-any cline-neutral"> </span>
|
|
541
545
|
<span class="cline-any cline-no"> </span>
|
|
542
546
|
<span class="cline-any cline-no"> </span>
|
|
543
547
|
<span class="cline-any cline-neutral"> </span>
|
|
544
548
|
<span class="cline-any cline-no"> </span>
|
|
545
549
|
<span class="cline-any cline-no"> </span>
|
|
546
550
|
<span class="cline-any cline-neutral"> </span>
|
|
547
|
-
<span class="cline-any cline-
|
|
548
|
-
<span class="cline-any cline-
|
|
551
|
+
<span class="cline-any cline-yes">2x</span>
|
|
552
|
+
<span class="cline-any cline-yes">2x</span>
|
|
549
553
|
<span class="cline-any cline-neutral"> </span>
|
|
550
554
|
<span class="cline-any cline-no"> </span>
|
|
551
555
|
<span class="cline-any cline-no"> </span>
|
|
@@ -553,54 +557,52 @@
|
|
|
553
557
|
<span class="cline-any cline-no"> </span>
|
|
554
558
|
<span class="cline-any cline-no"> </span>
|
|
555
559
|
<span class="cline-any cline-neutral"> </span>
|
|
556
|
-
<span class="cline-any cline-no"> </span>
|
|
557
|
-
<span class="cline-any cline-no"> </span>
|
|
558
560
|
<span class="cline-any cline-neutral"> </span>
|
|
561
|
+
<span class="cline-any cline-yes">4x</span>
|
|
562
|
+
<span class="cline-any cline-yes">4x</span>
|
|
563
|
+
<span class="cline-any cline-yes">2x</span>
|
|
559
564
|
<span class="cline-any cline-neutral"> </span>
|
|
560
|
-
<span class="cline-any cline-no"> </span>
|
|
561
|
-
<span class="cline-any cline-no"> </span>
|
|
562
|
-
<span class="cline-any cline-no"> </span>
|
|
563
565
|
<span class="cline-any cline-neutral"> </span>
|
|
566
|
+
<span class="cline-any cline-yes">4x</span>
|
|
564
567
|
<span class="cline-any cline-neutral"> </span>
|
|
565
|
-
<span class="cline-any cline-no"> </span>
|
|
566
568
|
<span class="cline-any cline-neutral"> </span>
|
|
567
569
|
<span class="cline-any cline-neutral"> </span>
|
|
568
570
|
<span class="cline-any cline-neutral"> </span>
|
|
569
571
|
<span class="cline-any cline-neutral"> </span>
|
|
570
572
|
<span class="cline-any cline-neutral"> </span>
|
|
571
573
|
<span class="cline-any cline-neutral"> </span>
|
|
574
|
+
<span class="cline-any cline-yes">4x</span>
|
|
572
575
|
<span class="cline-any cline-neutral"> </span>
|
|
573
|
-
<span class="cline-any cline-no"> </span>
|
|
574
576
|
<span class="cline-any cline-neutral"> </span>
|
|
575
577
|
<span class="cline-any cline-neutral"> </span>
|
|
576
578
|
<span class="cline-any cline-neutral"> </span>
|
|
577
579
|
<span class="cline-any cline-neutral"> </span>
|
|
578
580
|
<span class="cline-any cline-neutral"> </span>
|
|
579
581
|
<span class="cline-any cline-neutral"> </span>
|
|
582
|
+
<span class="cline-any cline-yes">3x</span>
|
|
580
583
|
<span class="cline-any cline-neutral"> </span>
|
|
581
|
-
<span class="cline-any cline-no"> </span>
|
|
582
584
|
<span class="cline-any cline-neutral"> </span>
|
|
583
585
|
<span class="cline-any cline-neutral"> </span>
|
|
584
586
|
<span class="cline-any cline-neutral"> </span>
|
|
585
587
|
<span class="cline-any cline-neutral"> </span>
|
|
588
|
+
<span class="cline-any cline-yes">3x</span>
|
|
589
|
+
<span class="cline-any cline-yes">7x</span>
|
|
590
|
+
<span class="cline-any cline-yes">7x</span>
|
|
591
|
+
<span class="cline-any cline-yes">7x</span>
|
|
592
|
+
<span class="cline-any cline-yes">4x</span>
|
|
593
|
+
<span class="cline-any cline-yes">2x</span>
|
|
586
594
|
<span class="cline-any cline-neutral"> </span>
|
|
587
|
-
<span class="cline-any cline-
|
|
588
|
-
<span class="cline-any cline-
|
|
589
|
-
<span class="cline-any cline-no"> </span>
|
|
590
|
-
<span class="cline-any cline-no"> </span>
|
|
591
|
-
<span class="cline-any cline-no"> </span>
|
|
592
|
-
<span class="cline-any cline-no"> </span>
|
|
595
|
+
<span class="cline-any cline-yes">4x</span>
|
|
596
|
+
<span class="cline-any cline-yes">2x</span>
|
|
593
597
|
<span class="cline-any cline-neutral"> </span>
|
|
594
|
-
<span class="cline-any cline-no"> </span>
|
|
595
|
-
<span class="cline-any cline-no"> </span>
|
|
596
598
|
<span class="cline-any cline-neutral"> </span>
|
|
599
|
+
<span class="cline-any cline-yes">3x</span>
|
|
597
600
|
<span class="cline-any cline-neutral"> </span>
|
|
598
|
-
<span class="cline-any cline-no"> </span>
|
|
599
601
|
<span class="cline-any cline-neutral"> </span>
|
|
600
602
|
<span class="cline-any cline-neutral"> </span>
|
|
603
|
+
<span class="cline-any cline-yes">3x</span>
|
|
604
|
+
<span class="cline-any cline-yes">3x</span>
|
|
601
605
|
<span class="cline-any cline-neutral"> </span>
|
|
602
|
-
<span class="cline-any cline-no"> </span>
|
|
603
|
-
<span class="cline-any cline-no"> </span>
|
|
604
606
|
<span class="cline-any cline-neutral"> </span>
|
|
605
607
|
<span class="cline-any cline-neutral"> </span>
|
|
606
608
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -608,22 +610,22 @@
|
|
|
608
610
|
<span class="cline-any cline-neutral"> </span>
|
|
609
611
|
<span class="cline-any cline-neutral"> </span>
|
|
610
612
|
<span class="cline-any cline-neutral"> </span>
|
|
613
|
+
<span class="cline-any cline-yes">3x</span>
|
|
614
|
+
<span class="cline-any cline-yes">1x</span>
|
|
615
|
+
<span class="cline-any cline-yes">2x</span>
|
|
616
|
+
<span class="cline-any cline-yes">1x</span>
|
|
617
|
+
<span class="cline-any cline-yes">1x</span>
|
|
618
|
+
<span class="cline-any cline-yes">1x</span>
|
|
611
619
|
<span class="cline-any cline-neutral"> </span>
|
|
612
|
-
<span class="cline-any cline-
|
|
613
|
-
<span class="cline-any cline-
|
|
614
|
-
<span class="cline-any cline-
|
|
615
|
-
<span class="cline-any cline-no"> </span>
|
|
616
|
-
<span class="cline-any cline-no"> </span>
|
|
617
|
-
<span class="cline-any cline-no"> </span>
|
|
620
|
+
<span class="cline-any cline-yes">3x</span>
|
|
621
|
+
<span class="cline-any cline-yes">3x</span>
|
|
622
|
+
<span class="cline-any cline-yes">3x</span>
|
|
618
623
|
<span class="cline-any cline-neutral"> </span>
|
|
619
|
-
<span class="cline-any cline-
|
|
620
|
-
<span class="cline-any cline-
|
|
621
|
-
<span class="cline-any cline-no"> </span>
|
|
624
|
+
<span class="cline-any cline-yes">3x</span>
|
|
625
|
+
<span class="cline-any cline-yes">3x</span>
|
|
622
626
|
<span class="cline-any cline-neutral"> </span>
|
|
623
|
-
<span class="cline-any cline-
|
|
624
|
-
<span class="cline-any cline-no"> </span>
|
|
627
|
+
<span class="cline-any cline-yes">3x</span>
|
|
625
628
|
<span class="cline-any cline-neutral"> </span>
|
|
626
|
-
<span class="cline-any cline-no"> </span>
|
|
627
629
|
<span class="cline-any cline-neutral"> </span>
|
|
628
630
|
<span class="cline-any cline-neutral"> </span>
|
|
629
631
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -633,8 +635,8 @@
|
|
|
633
635
|
<span class="cline-any cline-neutral"> </span>
|
|
634
636
|
<span class="cline-any cline-neutral"> </span>
|
|
635
637
|
<span class="cline-any cline-neutral"> </span>
|
|
638
|
+
<span class="cline-any cline-yes">14x</span>
|
|
636
639
|
<span class="cline-any cline-neutral"> </span>
|
|
637
|
-
<span class="cline-any cline-yes">2x</span>
|
|
638
640
|
<span class="cline-any cline-neutral"> </span>
|
|
639
641
|
<span class="cline-any cline-neutral"> </span>
|
|
640
642
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -660,68 +662,71 @@
|
|
|
660
662
|
<span class="cline-any cline-neutral"> </span>
|
|
661
663
|
<span class="cline-any cline-neutral"> </span>
|
|
662
664
|
<span class="cline-any cline-neutral"> </span>
|
|
665
|
+
<span class="cline-any cline-yes">14x</span>
|
|
663
666
|
<span class="cline-any cline-neutral"> </span>
|
|
667
|
+
<span class="cline-any cline-yes">14x</span>
|
|
664
668
|
<span class="cline-any cline-yes">2x</span>
|
|
665
669
|
<span class="cline-any cline-neutral"> </span>
|
|
670
|
+
<span class="cline-any cline-neutral"> </span>
|
|
671
|
+
<span class="cline-any cline-yes">14x</span>
|
|
666
672
|
<span class="cline-any cline-yes">2x</span>
|
|
667
|
-
<span class="cline-any cline-no"> </span>
|
|
668
673
|
<span class="cline-any cline-neutral"> </span>
|
|
669
674
|
<span class="cline-any cline-neutral"> </span>
|
|
670
|
-
<span class="cline-any cline-yes">
|
|
675
|
+
<span class="cline-any cline-yes">14x</span>
|
|
671
676
|
<span class="cline-any cline-yes">1x</span>
|
|
672
677
|
<span class="cline-any cline-neutral"> </span>
|
|
673
678
|
<span class="cline-any cline-neutral"> </span>
|
|
674
|
-
<span class="cline-any cline-yes">
|
|
679
|
+
<span class="cline-any cline-yes">14x</span>
|
|
675
680
|
<span class="cline-any cline-yes">1x</span>
|
|
676
681
|
<span class="cline-any cline-yes">1x</span>
|
|
677
682
|
<span class="cline-any cline-yes">1x</span>
|
|
678
683
|
<span class="cline-any cline-neutral"> </span>
|
|
679
684
|
<span class="cline-any cline-neutral"> </span>
|
|
680
|
-
<span class="cline-any cline-yes">
|
|
685
|
+
<span class="cline-any cline-yes">14x</span>
|
|
681
686
|
<span class="cline-any cline-yes">1x</span>
|
|
682
687
|
<span class="cline-any cline-neutral"> </span>
|
|
683
688
|
<span class="cline-any cline-neutral"> </span>
|
|
689
|
+
<span class="cline-any cline-yes">14x</span>
|
|
684
690
|
<span class="cline-any cline-yes">2x</span>
|
|
685
|
-
<span class="cline-any cline-yes">1x</span>
|
|
686
691
|
<span class="cline-any cline-neutral"> </span>
|
|
687
692
|
<span class="cline-any cline-neutral"> </span>
|
|
688
|
-
<span class="cline-any cline-yes">
|
|
689
|
-
<span class="cline-any cline-
|
|
693
|
+
<span class="cline-any cline-yes">14x</span>
|
|
694
|
+
<span class="cline-any cline-yes">1x</span>
|
|
690
695
|
<span class="cline-any cline-neutral"> </span>
|
|
691
|
-
<span class="cline-any cline-yes">
|
|
692
|
-
<span class="cline-any cline-
|
|
693
|
-
<span class="cline-any cline-
|
|
696
|
+
<span class="cline-any cline-yes">14x</span>
|
|
697
|
+
<span class="cline-any cline-yes">1x</span>
|
|
698
|
+
<span class="cline-any cline-yes">1x</span>
|
|
694
699
|
<span class="cline-any cline-neutral"> </span>
|
|
695
|
-
<span class="cline-any cline-yes">
|
|
700
|
+
<span class="cline-any cline-yes">14x</span>
|
|
696
701
|
<span class="cline-any cline-yes">1x</span>
|
|
697
702
|
<span class="cline-any cline-neutral"> </span>
|
|
698
|
-
<span class="cline-any cline-yes">
|
|
699
|
-
<span class="cline-any cline-
|
|
703
|
+
<span class="cline-any cline-yes">14x</span>
|
|
704
|
+
<span class="cline-any cline-yes">4x</span>
|
|
700
705
|
<span class="cline-any cline-neutral"> </span>
|
|
701
706
|
<span class="cline-any cline-neutral"> </span>
|
|
702
707
|
<span class="cline-any cline-neutral"> </span>
|
|
703
708
|
<span class="cline-any cline-neutral"> </span>
|
|
704
|
-
<span class="cline-any cline-yes">
|
|
705
|
-
<span class="cline-any cline-
|
|
709
|
+
<span class="cline-any cline-yes">14x</span>
|
|
710
|
+
<span class="cline-any cline-yes">3x</span>
|
|
706
711
|
<span class="cline-any cline-neutral"> </span>
|
|
707
|
-
<span class="cline-any cline-yes">
|
|
708
|
-
<span class="cline-any cline-
|
|
712
|
+
<span class="cline-any cline-yes">14x</span>
|
|
713
|
+
<span class="cline-any cline-yes">3x</span>
|
|
709
714
|
<span class="cline-any cline-neutral"> </span>
|
|
715
|
+
<span class="cline-any cline-yes">14x</span>
|
|
710
716
|
<span class="cline-any cline-yes">2x</span>
|
|
711
|
-
<span class="cline-any cline-no"> </span>
|
|
712
717
|
<span class="cline-any cline-neutral"> </span>
|
|
713
718
|
<span class="cline-any cline-neutral"> </span>
|
|
714
|
-
<span class="cline-any cline-yes">
|
|
719
|
+
<span class="cline-any cline-yes">14x</span>
|
|
715
720
|
<span class="cline-any cline-neutral"> </span>
|
|
716
|
-
<span class="cline-any cline-yes">
|
|
717
|
-
<span class="cline-any cline-yes">
|
|
721
|
+
<span class="cline-any cline-yes">14x</span>
|
|
722
|
+
<span class="cline-any cline-yes">14x</span>
|
|
718
723
|
<span class="cline-any cline-neutral"> </span>
|
|
719
724
|
<span class="cline-any cline-neutral"> </span>
|
|
720
725
|
<span class="cline-any cline-neutral"> </span>
|
|
721
726
|
<span class="cline-any cline-neutral"> </span>
|
|
722
727
|
<span class="cline-any cline-neutral"> </span>
|
|
723
728
|
<span class="cline-any cline-neutral"> </span>
|
|
724
|
-
<span class="cline-any cline-yes">
|
|
729
|
+
<span class="cline-any cline-yes">14x</span>
|
|
725
730
|
<span class="cline-any cline-neutral"> </span>
|
|
726
731
|
<span class="cline-any cline-neutral"> </span>
|
|
727
732
|
<span class="cline-any cline-neutral"> </span></td><td class="text"><pre class="prettyprint lang-js">import _ from "lodash";
|
|
@@ -736,8 +741,8 @@ export default class Ingest {
|
|
|
736
741
|
* @param {*} info
|
|
737
742
|
* @param {*} mediaType
|
|
738
743
|
*/
|
|
739
|
-
|
|
740
|
-
let schema =
|
|
744
|
+
static mapFromMediainfo(info, mediaType) {
|
|
745
|
+
let schema = {
|
|
741
746
|
Aspect: null,
|
|
742
747
|
Standard: null,
|
|
743
748
|
Resolution: null,
|
|
@@ -750,38 +755,38 @@ export default class Ingest {
|
|
|
750
755
|
Duration: null
|
|
751
756
|
};
|
|
752
757
|
|
|
753
|
-
let tags =
|
|
758
|
+
let tags = {};
|
|
754
759
|
|
|
755
|
-
|
|
756
|
-
|
|
760
|
+
if (!info.File) {
|
|
761
|
+
throw "missing info.File";
|
|
757
762
|
}
|
|
758
763
|
|
|
759
|
-
|
|
760
|
-
|
|
764
|
+
if (!info.File.track) {
|
|
765
|
+
throw "missing info.File.track";
|
|
761
766
|
}
|
|
762
767
|
|
|
763
768
|
let general;
|
|
764
|
-
|
|
765
|
-
|
|
769
|
+
if (!Array.isArray(info["File"]["track"])) {
|
|
770
|
+
general = info["File"]["track"];
|
|
766
771
|
} else {
|
|
767
|
-
|
|
772
|
+
general = _.find(info["File"]["track"], { _type: "General" });
|
|
768
773
|
}
|
|
769
774
|
|
|
770
|
-
|
|
775
|
+
switch (mediaType) {
|
|
771
776
|
case "video":
|
|
772
|
-
|
|
773
|
-
|
|
777
|
+
mediaType = "Video";
|
|
778
|
+
break;
|
|
774
779
|
case "image":
|
|
775
|
-
|
|
776
|
-
|
|
780
|
+
mediaType = "Image";
|
|
781
|
+
break;
|
|
777
782
|
default:
|
|
778
|
-
<span class="
|
|
779
|
-
|
|
783
|
+
<span class="missing-if-branch" title="else path not taken" >E</span>if (general.Format && general.Format == "MXF") {
|
|
784
|
+
tags.Usage = "broadcast";
|
|
780
785
|
}
|
|
781
|
-
|
|
786
|
+
return tags;
|
|
782
787
|
}
|
|
783
788
|
|
|
784
|
-
let mediainfoDefaults =
|
|
789
|
+
let mediainfoDefaults = {
|
|
785
790
|
DisplayAspectRatio: "",
|
|
786
791
|
Format: "",
|
|
787
792
|
Standard: "",
|
|
@@ -791,117 +796,117 @@ export default class Ingest {
|
|
|
791
796
|
ScanType: ""
|
|
792
797
|
};
|
|
793
798
|
|
|
794
|
-
let media =
|
|
799
|
+
let media = _.find(info["File"]["track"], {
|
|
795
800
|
_type: mediaType
|
|
796
801
|
});
|
|
797
|
-
|
|
802
|
+
media = _.merge({}, mediainfoDefaults, media);
|
|
798
803
|
|
|
799
|
-
let width =
|
|
800
|
-
let height =
|
|
801
|
-
let Resolution =
|
|
802
|
-
|
|
803
|
-
|
|
804
|
+
let width = parseInt(media["Width"].replace(" ", "").match(/[0-9 ]+/));
|
|
805
|
+
let height = parseInt(media["Height"].replace(" ", "").match(/[0-9 ]+/));
|
|
806
|
+
let Resolution = width && height ? `${width}x${height}` : null;
|
|
807
|
+
if (Resolution) {
|
|
808
|
+
tags.Resolution = Resolution;
|
|
804
809
|
}
|
|
805
810
|
|
|
806
|
-
let Standard = <span class="
|
|
807
|
-
<span class="
|
|
811
|
+
let Standard = media["Standard"] ? <span class="branch-0 cbranch-no" title="branch not covered" >media["Standard"].toLowerCase() </span>: null;
|
|
812
|
+
<span class="missing-if-branch" title="if path not taken" >I</span>if (Standard) {
|
|
808
813
|
<span class="cstat-no" title="statement not covered" > tags.Standard = Standard;</span>
|
|
809
814
|
}
|
|
810
815
|
|
|
811
|
-
let framerate =
|
|
812
|
-
|
|
816
|
+
let framerate = media["FrameRate"];
|
|
817
|
+
switch (framerate) {
|
|
813
818
|
case "23.976":
|
|
814
|
-
|
|
815
|
-
|
|
816
|
-
case "24.000"
|
|
819
|
+
framerate = "23.98";
|
|
820
|
+
break;
|
|
821
|
+
<span class="branch-1 cbranch-no" title="branch not covered" > case "24.000":</span>
|
|
817
822
|
<span class="cstat-no" title="statement not covered" > framerate = "24";</span>
|
|
818
823
|
<span class="cstat-no" title="statement not covered" > break;</span>
|
|
819
|
-
case "25.000"
|
|
824
|
+
<span class="branch-2 cbranch-no" title="branch not covered" > case "25.000":</span>
|
|
820
825
|
<span class="cstat-no" title="statement not covered" > framerate = "25";</span>
|
|
821
826
|
<span class="cstat-no" title="statement not covered" > break;</span>
|
|
822
|
-
case "29.970"
|
|
827
|
+
<span class="branch-3 cbranch-no" title="branch not covered" > case "29.970":</span>
|
|
823
828
|
<span class="cstat-no" title="statement not covered" > framerate = "29.97";</span>
|
|
824
829
|
<span class="cstat-no" title="statement not covered" > break;</span>
|
|
825
|
-
case "50.000"
|
|
830
|
+
<span class="branch-4 cbranch-no" title="branch not covered" > case "50.000":</span>
|
|
826
831
|
<span class="cstat-no" title="statement not covered" > framerate = "50";</span>
|
|
827
832
|
<span class="cstat-no" title="statement not covered" > break;</span>
|
|
828
|
-
case "59.940"
|
|
833
|
+
<span class="branch-5 cbranch-no" title="branch not covered" > case "59.940":</span>
|
|
829
834
|
<span class="cstat-no" title="statement not covered" > framerate = "59.94";</span>
|
|
830
835
|
<span class="cstat-no" title="statement not covered" > break;</span>
|
|
831
836
|
}
|
|
832
|
-
|
|
833
|
-
|
|
834
|
-
|
|
835
|
-
|
|
837
|
+
framerate = parseFloat(framerate).toString();
|
|
838
|
+
framerate = framerate != "NaN" ? framerate : null;
|
|
839
|
+
if (framerate) {
|
|
840
|
+
tags.Framerate = framerate;
|
|
836
841
|
}
|
|
837
842
|
|
|
838
|
-
<span class="
|
|
839
|
-
|
|
840
|
-
case "24"
|
|
843
|
+
<span class="missing-if-branch" title="else path not taken" >E</span>if (!tags.Standard) {
|
|
844
|
+
switch (tags.Framerate) {
|
|
845
|
+
<span class="branch-0 cbranch-no" title="branch not covered" > case "24":</span>
|
|
841
846
|
case "23.98":
|
|
842
847
|
case "29.97":
|
|
843
848
|
case "59.94":
|
|
844
|
-
|
|
845
|
-
|
|
846
|
-
case "25"
|
|
847
|
-
case "50"
|
|
849
|
+
tags.Standard = "ntsc";
|
|
850
|
+
break;
|
|
851
|
+
<span class="branch-4 cbranch-no" title="branch not covered" > case "25":</span>
|
|
852
|
+
<span class="branch-5 cbranch-no" title="branch not covered" > case "50":</span>
|
|
848
853
|
<span class="cstat-no" title="statement not covered" > tags.Standard = "pal";</span>
|
|
849
854
|
<span class="cstat-no" title="statement not covered" > break;</span>
|
|
850
855
|
}
|
|
851
856
|
}
|
|
852
857
|
|
|
853
858
|
let Codec;
|
|
854
|
-
|
|
859
|
+
switch (media["Format"]) {
|
|
855
860
|
case "AVC":
|
|
856
|
-
|
|
857
|
-
|
|
861
|
+
Codec = "h264";
|
|
862
|
+
break;
|
|
858
863
|
case "ProRes":
|
|
859
|
-
|
|
860
|
-
|
|
864
|
+
Codec = "prores";
|
|
865
|
+
break;
|
|
861
866
|
}
|
|
862
|
-
|
|
863
|
-
|
|
867
|
+
if (Codec) {
|
|
868
|
+
tags.Codec = Codec;
|
|
864
869
|
}
|
|
865
870
|
|
|
866
|
-
|
|
867
|
-
|
|
871
|
+
if (tags.Codec == "h264") {
|
|
872
|
+
tags.Usage = "online";
|
|
868
873
|
}
|
|
869
874
|
|
|
870
|
-
|
|
871
|
-
|
|
875
|
+
if (tags.Codec == "prores") {
|
|
876
|
+
tags.Usage = "broadcast";
|
|
872
877
|
}
|
|
873
878
|
|
|
874
|
-
<span class="
|
|
879
|
+
<span class="missing-if-branch" title="if path not taken" >I</span>if (general && general["Format"] == "MXF") {
|
|
875
880
|
<span class="cstat-no" title="statement not covered" > tags.Usage = "broadcast";</span>
|
|
876
881
|
}
|
|
877
882
|
|
|
878
|
-
|
|
879
|
-
case "1.000"
|
|
883
|
+
switch (media["DisplayAspectRatio"]) {
|
|
884
|
+
<span class="branch-0 cbranch-no" title="branch not covered" > case "1.000":</span>
|
|
880
885
|
<span class="cstat-no" title="statement not covered" > tags.Aspect = "1:1";</span>
|
|
881
886
|
<span class="cstat-no" title="statement not covered" > break;</span>
|
|
882
|
-
case "1.347"
|
|
887
|
+
<span class="branch-1 cbranch-no" title="branch not covered" > case "1.347":</span>
|
|
883
888
|
<span class="cstat-no" title="statement not covered" > tags.Aspect = "4:3";</span>
|
|
884
889
|
<span class="cstat-no" title="statement not covered" > break;</span>
|
|
885
|
-
case "1.756"
|
|
890
|
+
<span class="branch-2 cbranch-no" title="branch not covered" > case "1.756":</span>
|
|
886
891
|
<span class="cstat-no" title="statement not covered" > tags.Aspect = "16:9";</span>
|
|
887
892
|
<span class="cstat-no" title="statement not covered" > break;</span>
|
|
888
893
|
case "1.778":
|
|
889
|
-
|
|
890
|
-
|
|
891
|
-
case "1.366"
|
|
894
|
+
tags.Aspect = "16:9";
|
|
895
|
+
break;
|
|
896
|
+
<span class="branch-4 cbranch-no" title="branch not covered" > case "1.366":</span>
|
|
892
897
|
<span class="cstat-no" title="statement not covered" > tags.Aspect = "4:3";</span>
|
|
893
898
|
<span class="cstat-no" title="statement not covered" > break;</span>
|
|
894
|
-
case "0.562"
|
|
899
|
+
<span class="branch-5 cbranch-no" title="branch not covered" > case "0.562":</span>
|
|
895
900
|
<span class="cstat-no" title="statement not covered" > tags.Aspect = "9:16";</span>
|
|
896
901
|
<span class="cstat-no" title="statement not covered" > break;</span>
|
|
897
902
|
}
|
|
898
903
|
|
|
899
|
-
let ScanType =
|
|
900
|
-
|
|
901
|
-
|
|
904
|
+
let ScanType = media["ScanType"].toLowerCase() || null;
|
|
905
|
+
if (ScanType) {
|
|
906
|
+
tags["Frame Mode"] = ScanType;
|
|
902
907
|
}
|
|
903
908
|
|
|
904
|
-
let ingest =
|
|
909
|
+
let ingest = {
|
|
905
910
|
selected: {
|
|
906
911
|
download: {
|
|
907
912
|
tags: tags
|
|
@@ -909,37 +914,37 @@ export default class Ingest {
|
|
|
909
914
|
}
|
|
910
915
|
};
|
|
911
916
|
|
|
912
|
-
|
|
917
|
+
return ingest;
|
|
913
918
|
}
|
|
914
919
|
/**
|
|
915
920
|
* Maps parsed filename data to a partial ingest record for later merging
|
|
916
921
|
* @param {*} filename
|
|
917
922
|
* @param {*} allTags
|
|
918
923
|
*/
|
|
919
|
-
|
|
920
|
-
let tags =
|
|
924
|
+
static mapFromFilename(filename, allTags) {
|
|
925
|
+
let tags = {
|
|
921
926
|
SubDub: {
|
|
922
927
|
sub: null,
|
|
923
928
|
dub: null
|
|
924
929
|
}
|
|
925
930
|
};
|
|
926
|
-
|
|
927
|
-
let foundTag =
|
|
928
|
-
<span class="
|
|
929
|
-
|
|
930
|
-
|
|
931
|
-
|
|
931
|
+
filename.file.tags.forEach(tag => {
|
|
932
|
+
let foundTag = _.find(allTags, { name: tag });
|
|
933
|
+
<span class="missing-if-branch" title="else path not taken" >E</span>if (foundTag) {
|
|
934
|
+
if (foundTag.type == 'SubDub') {
|
|
935
|
+
if (foundTag.name == 'sub') {
|
|
936
|
+
tags.SubDub.sub = true;
|
|
932
937
|
}
|
|
933
|
-
|
|
934
|
-
|
|
938
|
+
if (foundTag.name == 'dub') {
|
|
939
|
+
tags.SubDub.dub = true;
|
|
935
940
|
}
|
|
936
941
|
} else {
|
|
937
|
-
|
|
942
|
+
tags[foundTag.type] = foundTag.name;
|
|
938
943
|
}
|
|
939
944
|
}
|
|
940
945
|
});
|
|
941
|
-
|
|
942
|
-
let ingest =
|
|
946
|
+
tags.Extra = filename.extra;
|
|
947
|
+
let ingest = {
|
|
943
948
|
selected: {
|
|
944
949
|
download: {
|
|
945
950
|
tags: tags
|
|
@@ -948,21 +953,21 @@ export default class Ingest {
|
|
|
948
953
|
}
|
|
949
954
|
}
|
|
950
955
|
};
|
|
951
|
-
|
|
952
|
-
|
|
953
|
-
} else
|
|
954
|
-
|
|
955
|
-
} else <span class="
|
|
956
|
-
|
|
956
|
+
if (filename.file.tags.includes('sub') && filename.file.tags.includes('dub')) {
|
|
957
|
+
ingest.selected.preview.type = 'both';
|
|
958
|
+
} else if (filename.file.tags.includes('sub')) {
|
|
959
|
+
ingest.selected.preview.type = 'sub';
|
|
960
|
+
} else <span class="missing-if-branch" title="else path not taken" >E</span>if (filename.file.tags.includes('dub')) {
|
|
961
|
+
ingest.selected.preview.type = 'dub';
|
|
957
962
|
}
|
|
958
|
-
<span class="
|
|
959
|
-
|
|
960
|
-
|
|
963
|
+
<span class="missing-if-branch" title="else path not taken" >E</span>if (filename.file.language) {
|
|
964
|
+
ingest.selected.preview.language = filename.file.language;
|
|
965
|
+
ingest.selected.download.language = filename.file.language;
|
|
961
966
|
}
|
|
962
|
-
<span class="
|
|
963
|
-
|
|
967
|
+
<span class="missing-if-branch" title="else path not taken" >E</span>if (filename.file.country) {
|
|
968
|
+
ingest.selected.download.country = filename.file.country;
|
|
964
969
|
}
|
|
965
|
-
|
|
970
|
+
return ingest;
|
|
966
971
|
}
|
|
967
972
|
/**
|
|
968
973
|
* Assembles Ingest based on weighted rules
|
|
@@ -1002,13 +1007,17 @@ export default class Ingest {
|
|
|
1002
1007
|
|
|
1003
1008
|
let ingest = _.merge(defaults, original, filename, mediainfo);
|
|
1004
1009
|
|
|
1005
|
-
|
|
1006
|
-
|
|
1010
|
+
if (original.asset && original.asset.creative) {
|
|
1011
|
+
ingest.selected.preview.revision = 'Unfinished';
|
|
1007
1012
|
}
|
|
1008
1013
|
|
|
1009
1014
|
if (!original.context.asset && filename.asset && filename.asset._id) {
|
|
1010
1015
|
ingest.selected.asset = filename.asset._id;
|
|
1011
1016
|
}
|
|
1017
|
+
|
|
1018
|
+
if (order.asset) {
|
|
1019
|
+
ingest.selected.asset = order.asset;
|
|
1020
|
+
}
|
|
1012
1021
|
|
|
1013
1022
|
if (ingest.workRequest) {
|
|
1014
1023
|
ingest.selected.project = ingest.context.project;
|
|
@@ -1024,40 +1033,40 @@ export default class Ingest {
|
|
|
1024
1033
|
ingest.selected.download.tags.Extra = [original.context.tag];
|
|
1025
1034
|
}
|
|
1026
1035
|
|
|
1027
|
-
|
|
1028
|
-
|
|
1036
|
+
if (order.territory) {
|
|
1037
|
+
ingest.selected.download.country = order.territory;
|
|
1029
1038
|
}
|
|
1030
|
-
|
|
1031
|
-
|
|
1032
|
-
|
|
1039
|
+
if (order.language) {
|
|
1040
|
+
ingest.selected.preview.language = order.language;
|
|
1041
|
+
ingest.selected.download.language = order.language;
|
|
1033
1042
|
}
|
|
1034
1043
|
if (order._id) {
|
|
1035
1044
|
ingest.selected.download.tags.Text = 'txtd';
|
|
1036
1045
|
}
|
|
1037
|
-
|
|
1038
|
-
|
|
1046
|
+
if (order.isSub() || order.isDub()) {
|
|
1047
|
+
ingest.selected.download.tags.SubDub = {
|
|
1039
1048
|
sub: order.isSub(),
|
|
1040
1049
|
dub: order.isDub()
|
|
1041
1050
|
}
|
|
1042
1051
|
}
|
|
1043
|
-
|
|
1044
|
-
|
|
1052
|
+
if (order.isSub()) {
|
|
1053
|
+
ingest.selected.preview.type = "sub";
|
|
1045
1054
|
}
|
|
1046
|
-
|
|
1047
|
-
|
|
1055
|
+
if (order.isDub()) {
|
|
1056
|
+
ingest.selected.preview.type = "dub";
|
|
1048
1057
|
}
|
|
1049
|
-
|
|
1050
|
-
|
|
1058
|
+
if (order.isSub() && order.isDub()) {
|
|
1059
|
+
ingest.selected.preview.type = "both";
|
|
1051
1060
|
}
|
|
1052
1061
|
|
|
1053
|
-
ingest.selected.preview.watermark = watermarks[0] ?
|
|
1062
|
+
ingest.selected.preview.watermark = watermarks[0] ? watermarks[0]._id : "";
|
|
1054
1063
|
|
|
1055
1064
|
let tags = ingest.selected.download.tags;
|
|
1056
1065
|
ingest.selected.preview.enabled =
|
|
1057
1066
|
!!(tags.Codec == "prores" &&
|
|
1058
|
-
|
|
1059
|
-
(
|
|
1060
|
-
|
|
1067
|
+
tags.Resolution.split("x")[1] == "1080" &&
|
|
1068
|
+
(tags.Framerate == "23.98" || <span class="branch-3 cbranch-no" title="branch not covered" >tags.Framerate == "25")</span> &&
|
|
1069
|
+
watermarks.length) ||
|
|
1061
1070
|
false;
|
|
1062
1071
|
|
|
1063
1072
|
return ingest;
|
|
@@ -1069,7 +1078,7 @@ export default class Ingest {
|
|
|
1069
1078
|
</div><!-- /wrapper -->
|
|
1070
1079
|
<div class='footer quiet pad2 space-top1 center small'>
|
|
1071
1080
|
Code coverage
|
|
1072
|
-
generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Thu
|
|
1081
|
+
generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Thu Aug 01 2019 10:00:08 GMT-0500 (Central Daylight Time)
|
|
1073
1082
|
</div>
|
|
1074
1083
|
</div>
|
|
1075
1084
|
<script src="prettify.js"></script>
|
|
@@ -1081,6 +1090,5 @@ window.onload = function () {
|
|
|
1081
1090
|
};
|
|
1082
1091
|
</script>
|
|
1083
1092
|
<script src="sorter.js"></script>
|
|
1084
|
-
<script src="block-navigation.js"></script>
|
|
1085
1093
|
</body>
|
|
1086
1094
|
</html>
|