@vizabi/reader-ddfcsv 4.2.0 → 5.0.1
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/.nyc_output/728a89bae7b247a7244820c1b6596c8b.json +1 -0
- package/.nyc_output/{b4e1a7f86ae858c85e0528842263588d.json → e875174b7b217be31b58605962f05304.json} +0 -0
- package/.travis.yml +0 -0
- package/CHANGELOG.md +0 -5
- package/LICENSE +0 -0
- package/README.md +0 -0
- package/coverage/base.css +0 -0
- package/coverage/block-navigation.js +0 -0
- package/coverage/index.html +39 -39
- package/coverage/prettify.css +0 -0
- package/coverage/prettify.js +0 -0
- package/coverage/sort-arrow-sprite.png +0 -0
- package/coverage/sorter.js +0 -0
- package/coverage/src/ddf-csv.ts.html +377 -377
- package/coverage/src/ddfcsv-error.ts.html +6 -6
- package/coverage/src/ddfcsv-reader.ts.html +52 -106
- package/coverage/src/file-readers/backend-file-reader.ts.html +15 -27
- package/coverage/src/file-readers/github-file-reader.ts.html +168 -0
- package/coverage/src/file-readers/index.html +26 -26
- package/coverage/src/index.html +29 -29
- package/coverage/src/index.ts.html +19 -4
- package/coverage/src/resource-selection-optimizer/in-clause-under-conjunction.ts.html +236 -236
- package/coverage/src/resource-selection-optimizer/index.html +20 -20
- package/coverage/src/resource-selection-optimizer/index.ts.html +3 -3
- package/coverage/src/test-cases/concepts.ts.html +1 -1
- package/coverage/src/test-cases/entities.ts.html +1 -1
- package/coverage/src/test-cases/index.html +1 -1
- package/deploy.js +0 -0
- package/dist/reader-ddfcsv-polyfill.js +1 -1
- package/dist/reader-ddfcsv-polyfill.js.map +1 -1
- package/dist/reader-ddfcsv.js +1 -1
- package/dist/reader-ddfcsv.js.map +1 -1
- package/icon.png +0 -0
- package/lib/src/ddf-csv.d.ts +0 -0
- package/lib/src/ddf-csv.js +0 -0
- package/lib/src/ddf-csv.js.map +0 -0
- package/lib/src/ddfcsv-error.d.ts +0 -0
- package/lib/src/ddfcsv-error.js +0 -0
- package/lib/src/ddfcsv-error.js.map +0 -0
- package/lib/src/ddfcsv-reader.d.ts +0 -0
- package/lib/src/ddfcsv-reader.js +1 -1
- package/lib/src/ddfcsv-reader.js.map +0 -0
- package/lib/src/file-readers/backend-file-reader.d.ts +0 -0
- package/lib/src/file-readers/backend-file-reader.js +0 -0
- package/lib/src/file-readers/backend-file-reader.js.map +0 -0
- package/lib/src/file-readers/github-path-adapter.d.ts +0 -0
- package/lib/src/file-readers/github-path-adapter.js +0 -0
- package/lib/src/file-readers/github-path-adapter.js.map +0 -0
- package/lib/src/index.d.ts +0 -0
- package/lib/src/index.js +0 -0
- package/lib/src/index.js.map +0 -0
- package/lib/src/interfaces.d.ts +0 -0
- package/lib/src/interfaces.js +0 -0
- package/lib/src/interfaces.js.map +0 -0
- package/lib/src/resource-selection-optimizer/in-clause-under-conjunction.d.ts +0 -0
- package/lib/src/resource-selection-optimizer/in-clause-under-conjunction.js +0 -0
- package/lib/src/resource-selection-optimizer/in-clause-under-conjunction.js.map +0 -0
- package/lib/src/resource-selection-optimizer/index.d.ts +0 -0
- package/lib/src/resource-selection-optimizer/index.js +0 -0
- package/lib/src/resource-selection-optimizer/index.js.map +0 -0
- package/lib-web/src/ddf-csv.d.ts +0 -0
- package/lib-web/src/ddf-csv.js +262 -376
- package/lib-web/src/ddf-csv.js.map +1 -1
- package/lib-web/src/ddfcsv-error.d.ts +0 -0
- package/lib-web/src/ddfcsv-error.js +8 -12
- package/lib-web/src/ddfcsv-error.js.map +1 -1
- package/lib-web/src/ddfcsv-reader.d.ts +0 -0
- package/lib-web/src/ddfcsv-reader.js +81 -123
- package/lib-web/src/ddfcsv-reader.js.map +1 -1
- package/lib-web/src/file-readers/frontend-file-reader.d.ts +0 -0
- package/lib-web/src/file-readers/frontend-file-reader.js +13 -16
- package/lib-web/src/file-readers/frontend-file-reader.js.map +1 -1
- package/lib-web/src/file-readers/github-path-adapter.d.ts +0 -0
- package/lib-web/src/file-readers/github-path-adapter.js +5 -5
- package/lib-web/src/file-readers/github-path-adapter.js.map +1 -1
- package/lib-web/src/index-web.d.ts +0 -0
- package/lib-web/src/index-web.js +2 -2
- package/lib-web/src/index-web.js.map +1 -1
- package/lib-web/src/interfaces.d.ts +0 -0
- package/lib-web/src/interfaces.js +0 -0
- package/lib-web/src/interfaces.js.map +0 -0
- package/lib-web/src/resource-selection-optimizer/in-clause-under-conjunction.d.ts +0 -0
- package/lib-web/src/resource-selection-optimizer/in-clause-under-conjunction.js +169 -348
- package/lib-web/src/resource-selection-optimizer/in-clause-under-conjunction.js.map +1 -1
- package/lib-web/src/resource-selection-optimizer/index.d.ts +0 -0
- package/lib-web/src/resource-selection-optimizer/index.js +4 -4
- package/lib-web/src/resource-selection-optimizer/index.js.map +1 -1
- package/package.json +2 -1
- package/scripts/set-own-version.js +0 -0
- package/src/ddf-csv.ts +0 -0
- package/src/ddfcsv-error.ts +0 -0
- package/src/ddfcsv-reader.ts +0 -0
- package/src/file-readers/backend-file-reader.ts +0 -0
- package/src/file-readers/frontend-file-reader.ts +0 -0
- package/src/file-readers/github-path-adapter.ts +0 -0
- package/src/index-web.ts +0 -0
- package/src/index.ts +0 -0
- package/src/interfaces.ts +0 -0
- package/src/resource-selection-optimizer/in-clause-under-conjunction.ts +0 -0
- package/src/resource-selection-optimizer/index.ts +0 -0
- package/src/test-cases/concepts.ts +0 -0
- package/src/test-cases/entities.ts +0 -0
- package/test/assets-fixtures/world-50m.json +0 -0
- package/test/assets.spec.ts +0 -0
- package/test/common.ts +0 -0
- package/test/definition/concepts-definition.spec.ts +0 -0
- package/test/definition/datapoints-definition.spec.ts +0 -0
- package/test/definition/entities-definition.spec.ts +0 -0
- package/test/definition/schema-definition.spec.ts +0 -0
- package/test/diagnostics.spec.ts +0 -0
- package/test/features-service.spec.ts +0 -0
- package/test/high-load.spec.ts +0 -0
- package/test/main.spec.ts +0 -0
- package/test/mocha.opts +0 -0
- package/test/multi-instances.spec.ts +0 -0
- package/test/result-fixtures/datapoints-assets.json +0 -0
- package/test/result-fixtures/in-clause-under-conjunction-1.json +0 -0
- package/test/result-fixtures/in-clause-under-conjunction-2.json +0 -0
- package/test/result-fixtures/multi-instances/concepts-sg.json +0 -0
- package/test/result-fixtures/multi-instances/concepts-soderstornsmodellen.json +0 -0
- package/test/result-fixtures/multi-instances/datapoints-sg.json +0 -0
- package/test/result-fixtures/multi-instances/datapoints-soderstornsmodellen.json +0 -0
- package/test/result-fixtures/multi-instances/entities-sg.json +0 -0
- package/test/result-fixtures/multi-instances/entities-soderstornsmodellen.json +0 -0
- package/test/result-fixtures/multi-instances/schema-sg.json +0 -0
- package/test/result-fixtures/multi-instances/schema-soderstornsmodellen.json +0 -0
- package/test/schema.spec.ts +0 -0
- package/test/tslint.json +0 -0
- package/tsconfig-web.json +1 -1
- package/tsconfig.json +0 -0
- package/tslint.json +0 -0
- package/.nyc_output/795caf0b3acca8aacbd9d932d086ab81.json +0 -1
- package/coverage/src/file-readers/github-path-adapter.ts.html +0 -228
|
@@ -20,24 +20,24 @@
|
|
|
20
20
|
</h1>
|
|
21
21
|
<div class='clearfix'>
|
|
22
22
|
<div class='fl pad1y space-right2'>
|
|
23
|
-
<span class="strong">
|
|
23
|
+
<span class="strong">91.43% </span>
|
|
24
24
|
<span class="quiet">Statements</span>
|
|
25
|
-
<span class='fraction'>
|
|
25
|
+
<span class='fraction'>352/385</span>
|
|
26
26
|
</div>
|
|
27
27
|
<div class='fl pad1y space-right2'>
|
|
28
|
-
<span class="strong">
|
|
28
|
+
<span class="strong">85.43% </span>
|
|
29
29
|
<span class="quiet">Branches</span>
|
|
30
|
-
<span class='fraction'>
|
|
30
|
+
<span class='fraction'>129/151</span>
|
|
31
31
|
</div>
|
|
32
32
|
<div class='fl pad1y space-right2'>
|
|
33
|
-
<span class="strong">
|
|
33
|
+
<span class="strong">91.8% </span>
|
|
34
34
|
<span class="quiet">Functions</span>
|
|
35
|
-
<span class='fraction'>
|
|
35
|
+
<span class='fraction'>112/122</span>
|
|
36
36
|
</div>
|
|
37
37
|
<div class='fl pad1y space-right2'>
|
|
38
|
-
<span class="strong">
|
|
38
|
+
<span class="strong">91.58% </span>
|
|
39
39
|
<span class="quiet">Lines</span>
|
|
40
|
-
<span class='fraction'>
|
|
40
|
+
<span class='fraction'>337/368</span>
|
|
41
41
|
</div>
|
|
42
42
|
</div>
|
|
43
43
|
<p class="quiet">
|
|
@@ -930,76 +930,76 @@
|
|
|
930
930
|
<span class="cline-any cline-yes">1x</span>
|
|
931
931
|
<span class="cline-any cline-neutral"> </span>
|
|
932
932
|
<span class="cline-any cline-neutral"> </span>
|
|
933
|
-
<span class="cline-any cline-yes">
|
|
933
|
+
<span class="cline-any cline-yes">826859x</span>
|
|
934
934
|
<span class="cline-any cline-neutral"> </span>
|
|
935
935
|
<span class="cline-any cline-yes">1x</span>
|
|
936
|
-
<span class="cline-any cline-yes">
|
|
936
|
+
<span class="cline-any cline-yes">5543x</span>
|
|
937
937
|
<span class="cline-any cline-neutral"> </span>
|
|
938
938
|
<span class="cline-any cline-neutral"> </span>
|
|
939
939
|
<span class="cline-any cline-neutral"> </span>
|
|
940
940
|
<span class="cline-any cline-neutral"> </span>
|
|
941
|
-
<span class="cline-any cline-yes">
|
|
941
|
+
<span class="cline-any cline-yes">5543x</span>
|
|
942
942
|
<span class="cline-any cline-neutral"> </span>
|
|
943
|
-
<span class="cline-any cline-yes">
|
|
944
|
-
<span class="cline-any cline-
|
|
943
|
+
<span class="cline-any cline-yes">9916939x</span>
|
|
944
|
+
<span class="cline-any cline-yes">2177x</span>
|
|
945
945
|
<span class="cline-any cline-no"> </span>
|
|
946
946
|
<span class="cline-any cline-no"> </span>
|
|
947
947
|
<span class="cline-any cline-neutral"> </span>
|
|
948
948
|
<span class="cline-any cline-neutral"> </span>
|
|
949
|
-
<span class="cline-any cline-yes">
|
|
949
|
+
<span class="cline-any cline-yes">3248876x</span>
|
|
950
950
|
<span class="cline-any cline-no"> </span>
|
|
951
|
-
<span class="cline-any cline-yes">
|
|
951
|
+
<span class="cline-any cline-yes">451528x</span>
|
|
952
952
|
<span class="cline-any cline-no"> </span>
|
|
953
953
|
<span class="cline-any cline-yes">370385x</span>
|
|
954
|
-
<span class="cline-any cline-
|
|
955
|
-
<span class="cline-any cline-yes">
|
|
956
|
-
<span class="cline-any cline-
|
|
954
|
+
<span class="cline-any cline-yes">4946x</span>
|
|
955
|
+
<span class="cline-any cline-yes">3931601x</span>
|
|
956
|
+
<span class="cline-any cline-yes">204x</span>
|
|
957
957
|
<span class="cline-any cline-neutral"> </span>
|
|
958
958
|
<span class="cline-any cline-neutral"> </span>
|
|
959
|
-
<span class="cline-any cline-yes">
|
|
960
|
-
<span class="cline-any cline-yes">
|
|
959
|
+
<span class="cline-any cline-yes">5543x</span>
|
|
960
|
+
<span class="cline-any cline-yes">5543x</span>
|
|
961
961
|
<span class="cline-any cline-neutral"> </span>
|
|
962
|
-
<span class="cline-any cline-yes">
|
|
962
|
+
<span class="cline-any cline-yes">5543x</span>
|
|
963
963
|
<span class="cline-any cline-neutral"> </span>
|
|
964
964
|
<span class="cline-any cline-neutral"> </span>
|
|
965
965
|
<span class="cline-any cline-neutral"> </span>
|
|
966
|
-
<span class="cline-any cline-yes">
|
|
967
|
-
<span class="cline-any cline-yes">
|
|
966
|
+
<span class="cline-any cline-yes">7743x</span>
|
|
967
|
+
<span class="cline-any cline-yes">7743x</span>
|
|
968
968
|
<span class="cline-any cline-neutral"> </span>
|
|
969
|
-
<span class="cline-any cline-yes">
|
|
970
|
-
<span class="cline-any cline-yes">
|
|
971
|
-
<span class="cline-any cline-yes">
|
|
969
|
+
<span class="cline-any cline-yes">7743x</span>
|
|
970
|
+
<span class="cline-any cline-yes">7743x</span>
|
|
971
|
+
<span class="cline-any cline-yes">2213x</span>
|
|
972
972
|
<span class="cline-any cline-neutral"> </span>
|
|
973
973
|
<span class="cline-any cline-neutral"> </span>
|
|
974
|
-
<span class="cline-any cline-yes">
|
|
975
|
-
<span class="cline-any cline-yes">
|
|
976
|
-
<span class="cline-any cline-yes">
|
|
977
|
-
<span class="cline-any cline-yes">
|
|
974
|
+
<span class="cline-any cline-yes">5530x</span>
|
|
975
|
+
<span class="cline-any cline-yes">5530x</span>
|
|
976
|
+
<span class="cline-any cline-yes">4x</span>
|
|
977
|
+
<span class="cline-any cline-yes">4x</span>
|
|
978
978
|
<span class="cline-any cline-neutral"> </span>
|
|
979
979
|
<span class="cline-any cline-neutral"> </span>
|
|
980
|
-
<span class="cline-any cline-yes">
|
|
981
|
-
<span class="cline-any cline-yes">
|
|
982
|
-
<span class="cline-any cline-yes">
|
|
983
|
-
<span class="cline-any cline-yes">
|
|
984
|
-
<span class="cline-any cline-yes">
|
|
980
|
+
<span class="cline-any cline-yes">5526x</span>
|
|
981
|
+
<span class="cline-any cline-yes">5526x</span>
|
|
982
|
+
<span class="cline-any cline-yes">5524x</span>
|
|
983
|
+
<span class="cline-any cline-yes">5524x</span>
|
|
984
|
+
<span class="cline-any cline-yes">5524x</span>
|
|
985
985
|
<span class="cline-any cline-neutral"> </span>
|
|
986
|
-
<span class="cline-any cline-yes">
|
|
987
|
-
<span class="cline-any cline-yes">
|
|
986
|
+
<span class="cline-any cline-yes">2x</span>
|
|
987
|
+
<span class="cline-any cline-yes">2x</span>
|
|
988
988
|
<span class="cline-any cline-neutral"> </span>
|
|
989
989
|
<span class="cline-any cline-neutral"> </span>
|
|
990
|
-
<span class="cline-any cline-yes">
|
|
990
|
+
<span class="cline-any cline-yes">5524x</span>
|
|
991
991
|
<span class="cline-any cline-neutral"> </span>
|
|
992
|
-
<span class="cline-any cline-yes">
|
|
992
|
+
<span class="cline-any cline-yes">5524x</span>
|
|
993
993
|
<span class="cline-any cline-neutral"> </span>
|
|
994
994
|
<span class="cline-any cline-neutral"> </span>
|
|
995
995
|
<span class="cline-any cline-neutral"> </span>
|
|
996
996
|
<span class="cline-any cline-neutral"> </span>
|
|
997
997
|
<span class="cline-any cline-neutral"> </span>
|
|
998
|
-
<span class="cline-any cline-yes">
|
|
998
|
+
<span class="cline-any cline-yes">7737x</span>
|
|
999
999
|
<span class="cline-any cline-neutral"> </span>
|
|
1000
|
-
<span class="cline-any cline-yes">
|
|
1000
|
+
<span class="cline-any cline-yes">7737x</span>
|
|
1001
1001
|
<span class="cline-any cline-neutral"> </span>
|
|
1002
|
-
<span class="cline-any cline-yes">
|
|
1002
|
+
<span class="cline-any cline-yes">7737x</span>
|
|
1003
1003
|
<span class="cline-any cline-neutral"> </span>
|
|
1004
1004
|
<span class="cline-any cline-neutral"> </span>
|
|
1005
1005
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -1007,33 +1007,33 @@
|
|
|
1007
1007
|
<span class="cline-any cline-neutral"> </span>
|
|
1008
1008
|
<span class="cline-any cline-neutral"> </span>
|
|
1009
1009
|
<span class="cline-any cline-neutral"> </span>
|
|
1010
|
-
<span class="cline-any cline-yes">
|
|
1011
|
-
<span class="cline-any cline-yes">
|
|
1012
|
-
<span class="cline-any cline-yes">
|
|
1010
|
+
<span class="cline-any cline-yes">7737x</span>
|
|
1011
|
+
<span class="cline-any cline-yes">7737x</span>
|
|
1012
|
+
<span class="cline-any cline-yes">7737x</span>
|
|
1013
1013
|
<span class="cline-any cline-neutral"> </span>
|
|
1014
1014
|
<span class="cline-any cline-neutral"> </span>
|
|
1015
|
-
<span class="cline-any cline-yes">
|
|
1015
|
+
<span class="cline-any cline-yes">7737x</span>
|
|
1016
1016
|
<span class="cline-any cline-neutral"> </span>
|
|
1017
1017
|
<span class="cline-any cline-no"> </span>
|
|
1018
1018
|
<span class="cline-any cline-no"> </span>
|
|
1019
1019
|
<span class="cline-any cline-neutral"> </span>
|
|
1020
|
-
<span class="cline-any cline-yes">
|
|
1020
|
+
<span class="cline-any cline-yes">7737x</span>
|
|
1021
1021
|
<span class="cline-any cline-neutral"> </span>
|
|
1022
1022
|
<span class="cline-any cline-neutral"> </span>
|
|
1023
1023
|
<span class="cline-any cline-neutral"> </span>
|
|
1024
|
-
<span class="cline-any cline-yes">
|
|
1025
|
-
<span class="cline-any cline-yes">
|
|
1026
|
-
<span class="cline-any cline-yes">
|
|
1024
|
+
<span class="cline-any cline-yes">7737x</span>
|
|
1025
|
+
<span class="cline-any cline-yes">172217x</span>
|
|
1026
|
+
<span class="cline-any cline-yes">16130x</span>
|
|
1027
1027
|
<span class="cline-any cline-neutral"> </span>
|
|
1028
1028
|
<span class="cline-any cline-neutral"> </span>
|
|
1029
1029
|
<span class="cline-any cline-neutral"> </span>
|
|
1030
1030
|
<span class="cline-any cline-neutral"> </span>
|
|
1031
1031
|
<span class="cline-any cline-neutral"> </span>
|
|
1032
|
-
<span class="cline-any cline-yes">
|
|
1032
|
+
<span class="cline-any cline-yes">7737x</span>
|
|
1033
1033
|
<span class="cline-any cline-neutral"> </span>
|
|
1034
1034
|
<span class="cline-any cline-neutral"> </span>
|
|
1035
1035
|
<span class="cline-any cline-neutral"> </span>
|
|
1036
|
-
<span class="cline-any cline-yes">
|
|
1036
|
+
<span class="cline-any cline-yes">7737x</span>
|
|
1037
1037
|
<span class="cline-any cline-neutral"> </span>
|
|
1038
1038
|
<span class="cline-any cline-neutral"> </span>
|
|
1039
1039
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -1043,32 +1043,32 @@
|
|
|
1043
1043
|
<span class="cline-any cline-neutral"> </span>
|
|
1044
1044
|
<span class="cline-any cline-neutral"> </span>
|
|
1045
1045
|
<span class="cline-any cline-neutral"> </span>
|
|
1046
|
-
<span class="cline-any cline-yes">
|
|
1046
|
+
<span class="cline-any cline-yes">7737x</span>
|
|
1047
1047
|
<span class="cline-any cline-no"> </span>
|
|
1048
1048
|
<span class="cline-any cline-no"> </span>
|
|
1049
1049
|
<span class="cline-any cline-neutral"> </span>
|
|
1050
1050
|
<span class="cline-any cline-neutral"> </span>
|
|
1051
|
-
<span class="cline-any cline-yes">
|
|
1051
|
+
<span class="cline-any cline-yes">7737x</span>
|
|
1052
1052
|
<span class="cline-any cline-neutral"> </span>
|
|
1053
|
-
<span class="cline-any cline-yes">
|
|
1054
|
-
<span class="cline-any cline-yes">
|
|
1053
|
+
<span class="cline-any cline-yes">7737x</span>
|
|
1054
|
+
<span class="cline-any cline-yes">7737x</span>
|
|
1055
1055
|
<span class="cline-any cline-neutral"> </span>
|
|
1056
1056
|
<span class="cline-any cline-neutral"> </span>
|
|
1057
|
-
<span class="cline-any cline-yes">
|
|
1058
|
-
<span class="cline-any cline-yes">
|
|
1057
|
+
<span class="cline-any cline-yes">7737x</span>
|
|
1058
|
+
<span class="cline-any cline-yes">7737x</span>
|
|
1059
1059
|
<span class="cline-any cline-neutral"> </span>
|
|
1060
|
-
<span class="cline-any cline-yes">
|
|
1061
|
-
<span class="cline-any cline-yes">
|
|
1062
|
-
<span class="cline-any cline-yes">
|
|
1060
|
+
<span class="cline-any cline-yes">7737x</span>
|
|
1061
|
+
<span class="cline-any cline-yes">31923x</span>
|
|
1062
|
+
<span class="cline-any cline-yes">31923x</span>
|
|
1063
1063
|
<span class="cline-any cline-neutral"> </span>
|
|
1064
|
-
<span class="cline-any cline-yes">
|
|
1064
|
+
<span class="cline-any cline-yes">31923x</span>
|
|
1065
1065
|
<span class="cline-any cline-no"> </span>
|
|
1066
1066
|
<span class="cline-any cline-neutral"> </span>
|
|
1067
1067
|
<span class="cline-any cline-neutral"> </span>
|
|
1068
1068
|
<span class="cline-any cline-neutral"> </span>
|
|
1069
1069
|
<span class="cline-any cline-neutral"> </span>
|
|
1070
|
-
<span class="cline-any cline-yes">
|
|
1071
|
-
<span class="cline-any cline-yes">
|
|
1070
|
+
<span class="cline-any cline-yes">7737x</span>
|
|
1071
|
+
<span class="cline-any cline-yes">172217x</span>
|
|
1072
1072
|
<span class="cline-any cline-no"> </span>
|
|
1073
1073
|
<span class="cline-any cline-neutral"> </span>
|
|
1074
1074
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -1076,52 +1076,52 @@
|
|
|
1076
1076
|
<span class="cline-any cline-neutral"> </span>
|
|
1077
1077
|
<span class="cline-any cline-neutral"> </span>
|
|
1078
1078
|
<span class="cline-any cline-neutral"> </span>
|
|
1079
|
-
<span class="cline-any cline-yes">
|
|
1079
|
+
<span class="cline-any cline-yes">7737x</span>
|
|
1080
1080
|
<span class="cline-any cline-neutral"> </span>
|
|
1081
1081
|
<span class="cline-any cline-neutral"> </span>
|
|
1082
1082
|
<span class="cline-any cline-neutral"> </span>
|
|
1083
1083
|
<span class="cline-any cline-neutral"> </span>
|
|
1084
|
-
<span class="cline-any cline-yes">
|
|
1085
|
-
<span class="cline-any cline-yes">
|
|
1084
|
+
<span class="cline-any cline-yes">15474x</span>
|
|
1085
|
+
<span class="cline-any cline-yes">219295x</span>
|
|
1086
1086
|
<span class="cline-any cline-neutral"> </span>
|
|
1087
1087
|
<span class="cline-any cline-neutral"> </span>
|
|
1088
1088
|
<span class="cline-any cline-neutral"> </span>
|
|
1089
1089
|
<span class="cline-any cline-neutral"> </span>
|
|
1090
|
-
<span class="cline-any cline-yes">
|
|
1090
|
+
<span class="cline-any cline-yes">7745x</span>
|
|
1091
1091
|
<span class="cline-any cline-neutral"> </span>
|
|
1092
1092
|
<span class="cline-any cline-neutral"> </span>
|
|
1093
|
-
<span class="cline-any cline-yes">
|
|
1094
|
-
<span class="cline-any cline-yes">
|
|
1095
|
-
<span class="cline-any cline-yes">
|
|
1096
|
-
<span class="cline-any cline-yes">
|
|
1097
|
-
<span class="cline-any cline-yes">
|
|
1093
|
+
<span class="cline-any cline-yes">7745x</span>
|
|
1094
|
+
<span class="cline-any cline-yes">7745x</span>
|
|
1095
|
+
<span class="cline-any cline-yes">7743x</span>
|
|
1096
|
+
<span class="cline-any cline-yes">7737x</span>
|
|
1097
|
+
<span class="cline-any cline-yes">7737x</span>
|
|
1098
1098
|
<span class="cline-any cline-neutral"> </span>
|
|
1099
|
-
<span class="cline-any cline-yes">
|
|
1100
|
-
<span class="cline-any cline-yes">
|
|
1099
|
+
<span class="cline-any cline-yes">7725x</span>
|
|
1100
|
+
<span class="cline-any cline-yes">19x</span>
|
|
1101
1101
|
<span class="cline-any cline-neutral"> </span>
|
|
1102
|
-
<span class="cline-any cline-yes">
|
|
1102
|
+
<span class="cline-any cline-yes">7706x</span>
|
|
1103
1103
|
<span class="cline-any cline-neutral"> </span>
|
|
1104
|
-
<span class="cline-any cline-yes">
|
|
1105
|
-
<span class="cline-any cline-
|
|
1106
|
-
<span class="cline-any cline-
|
|
1107
|
-
<span class="cline-any cline-
|
|
1108
|
-
<span class="cline-any cline-
|
|
1104
|
+
<span class="cline-any cline-yes">7706x</span>
|
|
1105
|
+
<span class="cline-any cline-yes">5x</span>
|
|
1106
|
+
<span class="cline-any cline-yes">5x</span>
|
|
1107
|
+
<span class="cline-any cline-yes">5x</span>
|
|
1108
|
+
<span class="cline-any cline-yes">5x</span>
|
|
1109
1109
|
<span class="cline-any cline-neutral"> </span>
|
|
1110
|
-
<span class="cline-any cline-
|
|
1110
|
+
<span class="cline-any cline-yes">5x</span>
|
|
1111
1111
|
<span class="cline-any cline-neutral"> </span>
|
|
1112
1112
|
<span class="cline-any cline-neutral"> </span>
|
|
1113
|
-
<span class="cline-any cline-yes">
|
|
1113
|
+
<span class="cline-any cline-yes">7706x</span>
|
|
1114
1114
|
<span class="cline-any cline-neutral"> </span>
|
|
1115
1115
|
<span class="cline-any cline-neutral"> </span>
|
|
1116
|
-
<span class="cline-any cline-yes">
|
|
1117
|
-
<span class="cline-any cline-yes">
|
|
1116
|
+
<span class="cline-any cline-yes">20x</span>
|
|
1117
|
+
<span class="cline-any cline-yes">20x</span>
|
|
1118
1118
|
<span class="cline-any cline-neutral"> </span>
|
|
1119
1119
|
<span class="cline-any cline-neutral"> </span>
|
|
1120
|
-
<span class="cline-any cline-yes">
|
|
1120
|
+
<span class="cline-any cline-yes">7725x</span>
|
|
1121
1121
|
<span class="cline-any cline-neutral"> </span>
|
|
1122
1122
|
<span class="cline-any cline-neutral"> </span>
|
|
1123
1123
|
<span class="cline-any cline-neutral"> </span>
|
|
1124
|
-
<span class="cline-any cline-yes">
|
|
1124
|
+
<span class="cline-any cline-yes">15443x</span>
|
|
1125
1125
|
<span class="cline-any cline-neutral"> </span>
|
|
1126
1126
|
<span class="cline-any cline-neutral"> </span>
|
|
1127
1127
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -1129,44 +1129,44 @@
|
|
|
1129
1129
|
<span class="cline-any cline-neutral"> </span>
|
|
1130
1130
|
<span class="cline-any cline-neutral"> </span>
|
|
1131
1131
|
<span class="cline-any cline-neutral"> </span>
|
|
1132
|
-
<span class="cline-any cline-yes">
|
|
1133
|
-
<span class="cline-any cline-yes">
|
|
1132
|
+
<span class="cline-any cline-yes">15443x</span>
|
|
1133
|
+
<span class="cline-any cline-yes">15443x</span>
|
|
1134
1134
|
<span class="cline-any cline-neutral"> </span>
|
|
1135
|
-
<span class="cline-any cline-yes">
|
|
1135
|
+
<span class="cline-any cline-yes">15443x</span>
|
|
1136
1136
|
<span class="cline-any cline-neutral"> </span>
|
|
1137
|
-
<span class="cline-any cline-yes">
|
|
1138
|
-
<span class="cline-any cline-yes">
|
|
1137
|
+
<span class="cline-any cline-yes">15443x</span>
|
|
1138
|
+
<span class="cline-any cline-yes">15443x</span>
|
|
1139
1139
|
<span class="cline-any cline-neutral"> </span>
|
|
1140
|
-
<span class="cline-any cline-yes">
|
|
1140
|
+
<span class="cline-any cline-yes">15443x</span>
|
|
1141
1141
|
<span class="cline-any cline-neutral"> </span>
|
|
1142
|
-
<span class="cline-any cline-yes">
|
|
1142
|
+
<span class="cline-any cline-yes">15443x</span>
|
|
1143
1143
|
<span class="cline-any cline-neutral"> </span>
|
|
1144
|
-
<span class="cline-any cline-yes">
|
|
1144
|
+
<span class="cline-any cline-yes">15443x</span>
|
|
1145
1145
|
<span class="cline-any cline-neutral"> </span>
|
|
1146
|
-
<span class="cline-any cline-yes">
|
|
1146
|
+
<span class="cline-any cline-yes">15443x</span>
|
|
1147
1147
|
<span class="cline-any cline-neutral"> </span>
|
|
1148
|
-
<span class="cline-any cline-yes">
|
|
1148
|
+
<span class="cline-any cline-yes">15443x</span>
|
|
1149
1149
|
<span class="cline-any cline-neutral"> </span>
|
|
1150
|
-
<span class="cline-any cline-yes">
|
|
1151
|
-
<span class="cline-any cline-yes">
|
|
1150
|
+
<span class="cline-any cline-yes">15443x</span>
|
|
1151
|
+
<span class="cline-any cline-yes">15443x</span>
|
|
1152
1152
|
<span class="cline-any cline-neutral"> </span>
|
|
1153
|
-
<span class="cline-any cline-yes">
|
|
1154
|
-
<span class="cline-any cline-yes">
|
|
1153
|
+
<span class="cline-any cline-yes">15443x</span>
|
|
1154
|
+
<span class="cline-any cline-yes">15443x</span>
|
|
1155
1155
|
<span class="cline-any cline-neutral"> </span>
|
|
1156
|
-
<span class="cline-any cline-yes">
|
|
1156
|
+
<span class="cline-any cline-yes">11482x</span>
|
|
1157
1157
|
<span class="cline-any cline-neutral"> </span>
|
|
1158
|
-
<span class="cline-any cline-yes">
|
|
1158
|
+
<span class="cline-any cline-yes">15443x</span>
|
|
1159
1159
|
<span class="cline-any cline-neutral"> </span>
|
|
1160
|
-
<span class="cline-any cline-yes">
|
|
1161
|
-
<span class="cline-any cline-yes">
|
|
1162
|
-
<span class="cline-any cline-yes">
|
|
1163
|
-
<span class="cline-any cline-yes">
|
|
1160
|
+
<span class="cline-any cline-yes">15443x</span>
|
|
1161
|
+
<span class="cline-any cline-yes">4600700x</span>
|
|
1162
|
+
<span class="cline-any cline-yes">726146x</span>
|
|
1163
|
+
<span class="cline-any cline-yes">726146x</span>
|
|
1164
1164
|
<span class="cline-any cline-neutral"> </span>
|
|
1165
|
-
<span class="cline-any cline-yes">
|
|
1166
|
-
<span class="cline-any cline-yes">
|
|
1167
|
-
<span class="cline-any cline-yes">
|
|
1165
|
+
<span class="cline-any cline-yes">15443x</span>
|
|
1166
|
+
<span class="cline-any cline-yes">15443x</span>
|
|
1167
|
+
<span class="cline-any cline-yes">15443x</span>
|
|
1168
1168
|
<span class="cline-any cline-neutral"> </span>
|
|
1169
|
-
<span class="cline-any cline-yes">
|
|
1169
|
+
<span class="cline-any cline-yes">15443x</span>
|
|
1170
1170
|
<span class="cline-any cline-neutral"> </span>
|
|
1171
1171
|
<span class="cline-any cline-neutral"> </span>
|
|
1172
1172
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -1176,16 +1176,16 @@
|
|
|
1176
1176
|
<span class="cline-any cline-neutral"> </span>
|
|
1177
1177
|
<span class="cline-any cline-neutral"> </span>
|
|
1178
1178
|
<span class="cline-any cline-neutral"> </span>
|
|
1179
|
-
<span class="cline-any cline-yes">
|
|
1180
|
-
<span class="cline-any cline-yes">
|
|
1181
|
-
<span class="cline-any cline-yes">
|
|
1182
|
-
<span class="cline-any cline-yes">
|
|
1183
|
-
<span class="cline-any cline-yes">
|
|
1184
|
-
<span class="cline-any cline-yes">
|
|
1185
|
-
<span class="cline-any cline-yes">
|
|
1179
|
+
<span class="cline-any cline-yes">15443x</span>
|
|
1180
|
+
<span class="cline-any cline-yes">15443x</span>
|
|
1181
|
+
<span class="cline-any cline-yes">27841x</span>
|
|
1182
|
+
<span class="cline-any cline-yes">15443x</span>
|
|
1183
|
+
<span class="cline-any cline-yes">25x</span>
|
|
1184
|
+
<span class="cline-any cline-yes">25x</span>
|
|
1185
|
+
<span class="cline-any cline-yes">512588x</span>
|
|
1186
1186
|
<span class="cline-any cline-neutral"> </span>
|
|
1187
1187
|
<span class="cline-any cline-neutral"> </span>
|
|
1188
|
-
<span class="cline-any cline-yes">
|
|
1188
|
+
<span class="cline-any cline-yes">15443x</span>
|
|
1189
1189
|
<span class="cline-any cline-neutral"> </span>
|
|
1190
1190
|
<span class="cline-any cline-neutral"> </span>
|
|
1191
1191
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -1193,8 +1193,8 @@
|
|
|
1193
1193
|
<span class="cline-any cline-neutral"> </span>
|
|
1194
1194
|
<span class="cline-any cline-neutral"> </span>
|
|
1195
1195
|
<span class="cline-any cline-neutral"> </span>
|
|
1196
|
-
<span class="cline-any cline-yes">
|
|
1197
|
-
<span class="cline-any cline-yes">
|
|
1196
|
+
<span class="cline-any cline-yes">25x</span>
|
|
1197
|
+
<span class="cline-any cline-yes">25x</span>
|
|
1198
1198
|
<span class="cline-any cline-neutral"> </span>
|
|
1199
1199
|
<span class="cline-any cline-neutral"> </span>
|
|
1200
1200
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -1205,57 +1205,57 @@
|
|
|
1205
1205
|
<span class="cline-any cline-neutral"> </span>
|
|
1206
1206
|
<span class="cline-any cline-neutral"> </span>
|
|
1207
1207
|
<span class="cline-any cline-neutral"> </span>
|
|
1208
|
-
<span class="cline-any cline-yes">
|
|
1209
|
-
<span class="cline-any cline-yes">
|
|
1210
|
-
<span class="cline-any cline-yes">
|
|
1211
|
-
<span class="cline-any cline-yes">
|
|
1208
|
+
<span class="cline-any cline-yes">468381x</span>
|
|
1209
|
+
<span class="cline-any cline-yes">468381x</span>
|
|
1210
|
+
<span class="cline-any cline-yes">468381x</span>
|
|
1211
|
+
<span class="cline-any cline-yes">468381x</span>
|
|
1212
1212
|
<span class="cline-any cline-neutral"> </span>
|
|
1213
1213
|
<span class="cline-any cline-neutral"> </span>
|
|
1214
1214
|
<span class="cline-any cline-no"> </span>
|
|
1215
1215
|
<span class="cline-any cline-no"> </span>
|
|
1216
1216
|
<span class="cline-any cline-neutral"> </span>
|
|
1217
|
-
<span class="cline-any cline-yes">
|
|
1218
|
-
<span class="cline-any cline-yes">
|
|
1217
|
+
<span class="cline-any cline-yes">25x</span>
|
|
1218
|
+
<span class="cline-any cline-yes">13x</span>
|
|
1219
1219
|
<span class="cline-any cline-neutral"> </span>
|
|
1220
|
-
<span class="cline-any cline-yes">
|
|
1221
|
-
<span class="cline-any cline-
|
|
1222
|
-
<span class="cline-any cline-
|
|
1220
|
+
<span class="cline-any cline-yes">12x</span>
|
|
1221
|
+
<span class="cline-any cline-yes">4x</span>
|
|
1222
|
+
<span class="cline-any cline-yes">15x</span>
|
|
1223
1223
|
<span class="cline-any cline-neutral"> </span>
|
|
1224
|
-
<span class="cline-any cline-yes">
|
|
1224
|
+
<span class="cline-any cline-yes">8x</span>
|
|
1225
1225
|
<span class="cline-any cline-neutral"> </span>
|
|
1226
1226
|
<span class="cline-any cline-neutral"> </span>
|
|
1227
1227
|
<span class="cline-any cline-neutral"> </span>
|
|
1228
|
-
<span class="cline-any cline-yes">
|
|
1229
|
-
<span class="cline-any cline-yes">
|
|
1228
|
+
<span class="cline-any cline-yes">15443x</span>
|
|
1229
|
+
<span class="cline-any cline-yes">15407x</span>
|
|
1230
1230
|
<span class="cline-any cline-neutral"> </span>
|
|
1231
1231
|
<span class="cline-any cline-neutral"> </span>
|
|
1232
1232
|
<span class="cline-any cline-neutral"> </span>
|
|
1233
|
-
<span class="cline-any cline-yes">
|
|
1234
|
-
<span class="cline-any cline-yes">
|
|
1235
|
-
<span class="cline-any cline-yes">
|
|
1233
|
+
<span class="cline-any cline-yes">36x</span>
|
|
1234
|
+
<span class="cline-any cline-yes">56x</span>
|
|
1235
|
+
<span class="cline-any cline-yes">52x</span>
|
|
1236
1236
|
<span class="cline-any cline-neutral"> </span>
|
|
1237
|
-
<span class="cline-any cline-
|
|
1238
|
-
<span class="cline-any cline-
|
|
1237
|
+
<span class="cline-any cline-yes">4x</span>
|
|
1238
|
+
<span class="cline-any cline-yes">4x</span>
|
|
1239
1239
|
<span class="cline-any cline-neutral"> </span>
|
|
1240
|
-
<span class="cline-any cline-
|
|
1240
|
+
<span class="cline-any cline-yes">4x</span>
|
|
1241
1241
|
<span class="cline-any cline-neutral"> </span>
|
|
1242
1242
|
<span class="cline-any cline-neutral"> </span>
|
|
1243
1243
|
<span class="cline-any cline-neutral"> </span>
|
|
1244
1244
|
<span class="cline-any cline-neutral"> </span>
|
|
1245
|
-
<span class="cline-any cline-yes">
|
|
1245
|
+
<span class="cline-any cline-yes">36x</span>
|
|
1246
1246
|
<span class="cline-any cline-neutral"> </span>
|
|
1247
|
-
<span class="cline-any cline-yes">
|
|
1248
|
-
<span class="cline-any cline-yes">
|
|
1249
|
-
<span class="cline-any cline-yes">
|
|
1247
|
+
<span class="cline-any cline-yes">36x</span>
|
|
1248
|
+
<span class="cline-any cline-yes">3702741x</span>
|
|
1249
|
+
<span class="cline-any cline-yes">5808483x</span>
|
|
1250
1250
|
<span class="cline-any cline-neutral"> </span>
|
|
1251
|
-
<span class="cline-any cline-yes">
|
|
1252
|
-
<span class="cline-any cline-yes">
|
|
1253
|
-
<span class="cline-any cline-yes">
|
|
1254
|
-
<span class="cline-any cline-yes">
|
|
1251
|
+
<span class="cline-any cline-yes">5808483x</span>
|
|
1252
|
+
<span class="cline-any cline-yes">1723442x</span>
|
|
1253
|
+
<span class="cline-any cline-yes">4085041x</span>
|
|
1254
|
+
<span class="cline-any cline-yes">1644124x</span>
|
|
1255
1255
|
<span class="cline-any cline-neutral"> </span>
|
|
1256
1256
|
<span class="cline-any cline-neutral"> </span>
|
|
1257
1257
|
<span class="cline-any cline-neutral"> </span>
|
|
1258
|
-
<span class="cline-any cline-yes">
|
|
1258
|
+
<span class="cline-any cline-yes">335175x</span>
|
|
1259
1259
|
<span class="cline-any cline-neutral"> </span>
|
|
1260
1260
|
<span class="cline-any cline-neutral"> </span>
|
|
1261
1261
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -1268,63 +1268,63 @@
|
|
|
1268
1268
|
<span class="cline-any cline-neutral"> </span>
|
|
1269
1269
|
<span class="cline-any cline-neutral"> </span>
|
|
1270
1270
|
<span class="cline-any cline-neutral"> </span>
|
|
1271
|
-
<span class="cline-any cline-yes">
|
|
1271
|
+
<span class="cline-any cline-yes">15537x</span>
|
|
1272
1272
|
<span class="cline-any cline-neutral"> </span>
|
|
1273
|
-
<span class="cline-any cline-yes">
|
|
1274
|
-
<span class="cline-any cline-yes">
|
|
1273
|
+
<span class="cline-any cline-yes">15537x</span>
|
|
1274
|
+
<span class="cline-any cline-yes">5598x</span>
|
|
1275
1275
|
<span class="cline-any cline-neutral"> </span>
|
|
1276
|
-
<span class="cline-any cline-yes">
|
|
1277
|
-
<span class="cline-any cline-yes">
|
|
1278
|
-
<span class="cline-any cline-yes">
|
|
1276
|
+
<span class="cline-any cline-yes">5598x</span>
|
|
1277
|
+
<span class="cline-any cline-yes">57x</span>
|
|
1278
|
+
<span class="cline-any cline-yes">5566x</span>
|
|
1279
1279
|
<span class="cline-any cline-neutral"> </span>
|
|
1280
|
-
<span class="cline-any cline-yes">
|
|
1281
|
-
<span class="cline-any cline-yes">
|
|
1280
|
+
<span class="cline-any cline-yes">16x</span>
|
|
1281
|
+
<span class="cline-any cline-yes">5550x</span>
|
|
1282
1282
|
<span class="cline-any cline-neutral"> </span>
|
|
1283
1283
|
<span class="cline-any cline-neutral"> </span>
|
|
1284
1284
|
<span class="cline-any cline-neutral"> </span>
|
|
1285
1285
|
<span class="cline-any cline-neutral"> </span>
|
|
1286
1286
|
<span class="cline-any cline-neutral"> </span>
|
|
1287
1287
|
<span class="cline-any cline-neutral"> </span>
|
|
1288
|
-
<span class="cline-any cline-yes">
|
|
1289
|
-
<span class="cline-any cline-yes">
|
|
1288
|
+
<span class="cline-any cline-yes">28x</span>
|
|
1289
|
+
<span class="cline-any cline-yes">5522x</span>
|
|
1290
1290
|
<span class="cline-any cline-neutral"> </span>
|
|
1291
1291
|
<span class="cline-any cline-neutral"> </span>
|
|
1292
|
-
<span class="cline-any cline-yes">
|
|
1292
|
+
<span class="cline-any cline-yes">37x</span>
|
|
1293
1293
|
<span class="cline-any cline-neutral"> </span>
|
|
1294
1294
|
<span class="cline-any cline-neutral"> </span>
|
|
1295
1295
|
<span class="cline-any cline-neutral"> </span>
|
|
1296
|
-
<span class="cline-any cline-yes">
|
|
1296
|
+
<span class="cline-any cline-yes">5485x</span>
|
|
1297
1297
|
<span class="cline-any cline-neutral"> </span>
|
|
1298
1298
|
<span class="cline-any cline-neutral"> </span>
|
|
1299
1299
|
<span class="cline-any cline-neutral"> </span>
|
|
1300
|
-
<span class="cline-any cline-yes">
|
|
1300
|
+
<span class="cline-any cline-yes">15537x</span>
|
|
1301
1301
|
<span class="cline-any cline-neutral"> </span>
|
|
1302
1302
|
<span class="cline-any cline-neutral"> </span>
|
|
1303
1303
|
<span class="cline-any cline-neutral"> </span>
|
|
1304
|
-
<span class="cline-any cline-yes">
|
|
1305
|
-
<span class="cline-any cline-yes">
|
|
1304
|
+
<span class="cline-any cline-yes">15443x</span>
|
|
1305
|
+
<span class="cline-any cline-yes">30886x</span>
|
|
1306
1306
|
<span class="cline-any cline-neutral"> </span>
|
|
1307
|
-
<span class="cline-any cline-yes">
|
|
1307
|
+
<span class="cline-any cline-yes">30886x</span>
|
|
1308
1308
|
<span class="cline-any cline-neutral"> </span>
|
|
1309
1309
|
<span class="cline-any cline-neutral"> </span>
|
|
1310
1310
|
<span class="cline-any cline-neutral"> </span>
|
|
1311
1311
|
<span class="cline-any cline-neutral"> </span>
|
|
1312
|
-
<span class="cline-any cline-yes">
|
|
1313
|
-
<span class="cline-any cline-yes">
|
|
1314
|
-
<span class="cline-any cline-yes">
|
|
1315
|
-
<span class="cline-any cline-yes">
|
|
1316
|
-
<span class="cline-any cline-yes">
|
|
1312
|
+
<span class="cline-any cline-yes">19x</span>
|
|
1313
|
+
<span class="cline-any cline-yes">19x</span>
|
|
1314
|
+
<span class="cline-any cline-yes">42x</span>
|
|
1315
|
+
<span class="cline-any cline-yes">42x</span>
|
|
1316
|
+
<span class="cline-any cline-yes">11638x</span>
|
|
1317
1317
|
<span class="cline-any cline-neutral"> </span>
|
|
1318
1318
|
<span class="cline-any cline-neutral"> </span>
|
|
1319
1319
|
<span class="cline-any cline-neutral"> </span>
|
|
1320
|
-
<span class="cline-any cline-yes">
|
|
1320
|
+
<span class="cline-any cline-yes">19x</span>
|
|
1321
1321
|
<span class="cline-any cline-neutral"> </span>
|
|
1322
|
-
<span class="cline-any cline-yes">
|
|
1323
|
-
<span class="cline-any cline-
|
|
1324
|
-
<span class="cline-any cline-yes">
|
|
1325
|
-
<span class="cline-any cline-yes">
|
|
1322
|
+
<span class="cline-any cline-yes">19x</span>
|
|
1323
|
+
<span class="cline-any cline-yes">8x</span>
|
|
1324
|
+
<span class="cline-any cline-yes">11x</span>
|
|
1325
|
+
<span class="cline-any cline-yes">11x</span>
|
|
1326
1326
|
<span class="cline-any cline-neutral"> </span>
|
|
1327
|
-
<span class="cline-any cline-yes">
|
|
1327
|
+
<span class="cline-any cline-yes">23x</span>
|
|
1328
1328
|
<span class="cline-any cline-neutral"> </span>
|
|
1329
1329
|
<span class="cline-any cline-no"> </span>
|
|
1330
1330
|
<span class="cline-any cline-no"> </span>
|
|
@@ -1333,62 +1333,62 @@
|
|
|
1333
1333
|
<span class="cline-any cline-neutral"> </span>
|
|
1334
1334
|
<span class="cline-any cline-neutral"> </span>
|
|
1335
1335
|
<span class="cline-any cline-neutral"> </span>
|
|
1336
|
-
<span class="cline-any cline-yes">
|
|
1337
|
-
<span class="cline-any cline-yes">
|
|
1338
|
-
<span class="cline-any cline-yes">
|
|
1336
|
+
<span class="cline-any cline-yes">726146x</span>
|
|
1337
|
+
<span class="cline-any cline-yes">3090191x</span>
|
|
1338
|
+
<span class="cline-any cline-yes">149838x</span>
|
|
1339
1339
|
<span class="cline-any cline-neutral"> </span>
|
|
1340
1340
|
<span class="cline-any cline-neutral"> </span>
|
|
1341
1341
|
<span class="cline-any cline-neutral"> </span>
|
|
1342
|
-
<span class="cline-any cline-yes">
|
|
1342
|
+
<span class="cline-any cline-yes">726146x</span>
|
|
1343
1343
|
<span class="cline-any cline-neutral"> </span>
|
|
1344
1344
|
<span class="cline-any cline-neutral"> </span>
|
|
1345
1345
|
<span class="cline-any cline-neutral"> </span>
|
|
1346
1346
|
<span class="cline-any cline-neutral"> </span>
|
|
1347
|
-
<span class="cline-any cline-yes">
|
|
1348
|
-
<span class="cline-any cline-yes">
|
|
1347
|
+
<span class="cline-any cline-yes">18920804x</span>
|
|
1348
|
+
<span class="cline-any cline-yes">17655306x</span>
|
|
1349
1349
|
<span class="cline-any cline-neutral"> </span>
|
|
1350
|
-
<span class="cline-any cline-yes">
|
|
1351
|
-
<span class="cline-any cline-yes">
|
|
1350
|
+
<span class="cline-any cline-yes">17655306x</span>
|
|
1351
|
+
<span class="cline-any cline-yes">10022551x</span>
|
|
1352
1352
|
<span class="cline-any cline-neutral"> </span>
|
|
1353
|
-
<span class="cline-any cline-yes">
|
|
1353
|
+
<span class="cline-any cline-yes">7632755x</span>
|
|
1354
1354
|
<span class="cline-any cline-neutral"> </span>
|
|
1355
|
-
<span class="cline-any cline-yes">
|
|
1355
|
+
<span class="cline-any cline-yes">3231767x</span>
|
|
1356
1356
|
<span class="cline-any cline-neutral"> </span>
|
|
1357
1357
|
<span class="cline-any cline-neutral"> </span>
|
|
1358
1358
|
<span class="cline-any cline-neutral"> </span>
|
|
1359
|
-
<span class="cline-any cline-yes">
|
|
1359
|
+
<span class="cline-any cline-yes">4400988x</span>
|
|
1360
1360
|
<span class="cline-any cline-neutral"> </span>
|
|
1361
1361
|
<span class="cline-any cline-neutral"> </span>
|
|
1362
1362
|
<span class="cline-any cline-neutral"> </span>
|
|
1363
1363
|
<span class="cline-any cline-neutral"> </span>
|
|
1364
1364
|
<span class="cline-any cline-neutral"> </span>
|
|
1365
|
-
<span class="cline-any cline-yes">
|
|
1366
|
-
<span class="cline-any cline-yes">
|
|
1365
|
+
<span class="cline-any cline-yes">15443x</span>
|
|
1366
|
+
<span class="cline-any cline-yes">15443x</span>
|
|
1367
1367
|
<span class="cline-any cline-neutral"> </span>
|
|
1368
1368
|
<span class="cline-any cline-neutral"> </span>
|
|
1369
1369
|
<span class="cline-any cline-neutral"> </span>
|
|
1370
|
-
<span class="cline-any cline-yes">
|
|
1370
|
+
<span class="cline-any cline-yes">27x</span>
|
|
1371
1371
|
<span class="cline-any cline-neutral"> </span>
|
|
1372
1372
|
<span class="cline-any cline-neutral"> </span>
|
|
1373
1373
|
<span class="cline-any cline-neutral"> </span>
|
|
1374
1374
|
<span class="cline-any cline-neutral"> </span>
|
|
1375
1375
|
<span class="cline-any cline-neutral"> </span>
|
|
1376
1376
|
<span class="cline-any cline-neutral"> </span>
|
|
1377
|
-
<span class="cline-any cline-yes">
|
|
1377
|
+
<span class="cline-any cline-yes">27x</span>
|
|
1378
1378
|
<span class="cline-any cline-neutral"> </span>
|
|
1379
1379
|
<span class="cline-any cline-neutral"> </span>
|
|
1380
|
-
<span class="cline-any cline-yes">
|
|
1380
|
+
<span class="cline-any cline-yes">8x</span>
|
|
1381
1381
|
<span class="cline-any cline-neutral"> </span>
|
|
1382
1382
|
<span class="cline-any cline-neutral"> </span>
|
|
1383
|
-
<span class="cline-any cline-yes">
|
|
1383
|
+
<span class="cline-any cline-yes">19x</span>
|
|
1384
1384
|
<span class="cline-any cline-neutral"> </span>
|
|
1385
1385
|
<span class="cline-any cline-neutral"> </span>
|
|
1386
1386
|
<span class="cline-any cline-neutral"> </span>
|
|
1387
1387
|
<span class="cline-any cline-neutral"> </span>
|
|
1388
|
-
<span class="cline-any cline-yes">
|
|
1388
|
+
<span class="cline-any cline-yes">19x</span>
|
|
1389
1389
|
<span class="cline-any cline-neutral"> </span>
|
|
1390
1390
|
<span class="cline-any cline-neutral"> </span>
|
|
1391
|
-
<span class="cline-any cline-yes">
|
|
1391
|
+
<span class="cline-any cline-yes">1658x</span>
|
|
1392
1392
|
<span class="cline-any cline-neutral"> </span>
|
|
1393
1393
|
<span class="cline-any cline-neutral"> </span>
|
|
1394
1394
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -1396,18 +1396,18 @@
|
|
|
1396
1396
|
<span class="cline-any cline-neutral"> </span>
|
|
1397
1397
|
<span class="cline-any cline-neutral"> </span>
|
|
1398
1398
|
<span class="cline-any cline-neutral"> </span>
|
|
1399
|
-
<span class="cline-any cline-yes">
|
|
1399
|
+
<span class="cline-any cline-yes">15500x</span>
|
|
1400
1400
|
<span class="cline-any cline-neutral"> </span>
|
|
1401
|
-
<span class="cline-any cline-yes">
|
|
1401
|
+
<span class="cline-any cline-yes">15500x</span>
|
|
1402
1402
|
<span class="cline-any cline-neutral"> </span>
|
|
1403
|
-
<span class="cline-any cline-yes">
|
|
1404
|
-
<span class="cline-any cline-yes">
|
|
1403
|
+
<span class="cline-any cline-yes">5553x</span>
|
|
1404
|
+
<span class="cline-any cline-yes">57x</span>
|
|
1405
1405
|
<span class="cline-any cline-neutral"> </span>
|
|
1406
|
-
<span class="cline-any cline-yes">
|
|
1406
|
+
<span class="cline-any cline-yes">5521x</span>
|
|
1407
1407
|
<span class="cline-any cline-neutral"> </span>
|
|
1408
1408
|
<span class="cline-any cline-neutral"> </span>
|
|
1409
1409
|
<span class="cline-any cline-neutral"> </span>
|
|
1410
|
-
<span class="cline-any cline-yes">
|
|
1410
|
+
<span class="cline-any cline-yes">15500x</span>
|
|
1411
1411
|
<span class="cline-any cline-neutral"> </span>
|
|
1412
1412
|
<span class="cline-any cline-neutral"> </span>
|
|
1413
1413
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -1417,18 +1417,18 @@
|
|
|
1417
1417
|
<span class="cline-any cline-neutral"> </span>
|
|
1418
1418
|
<span class="cline-any cline-neutral"> </span>
|
|
1419
1419
|
<span class="cline-any cline-neutral"> </span>
|
|
1420
|
-
<span class="cline-any cline-yes">
|
|
1421
|
-
<span class="cline-any cline-yes">
|
|
1420
|
+
<span class="cline-any cline-yes">30628x</span>
|
|
1421
|
+
<span class="cline-any cline-yes">30628x</span>
|
|
1422
1422
|
<span class="cline-any cline-neutral"> </span>
|
|
1423
|
-
<span class="cline-any cline-yes">
|
|
1424
|
-
<span class="cline-any cline-yes">
|
|
1423
|
+
<span class="cline-any cline-yes">30628x</span>
|
|
1424
|
+
<span class="cline-any cline-yes">198477x</span>
|
|
1425
1425
|
<span class="cline-any cline-neutral"> </span>
|
|
1426
|
-
<span class="cline-any cline-yes">
|
|
1427
|
-
<span class="cline-any cline-yes">
|
|
1426
|
+
<span class="cline-any cline-yes">198477x</span>
|
|
1427
|
+
<span class="cline-any cline-yes">26925x</span>
|
|
1428
1428
|
<span class="cline-any cline-neutral"> </span>
|
|
1429
1429
|
<span class="cline-any cline-neutral"> </span>
|
|
1430
1430
|
<span class="cline-any cline-neutral"> </span>
|
|
1431
|
-
<span class="cline-any cline-yes">
|
|
1431
|
+
<span class="cline-any cline-yes">30628x</span>
|
|
1432
1432
|
<span class="cline-any cline-neutral"> </span>
|
|
1433
1433
|
<span class="cline-any cline-neutral"> </span>
|
|
1434
1434
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -1438,21 +1438,21 @@
|
|
|
1438
1438
|
<span class="cline-any cline-neutral"> </span>
|
|
1439
1439
|
<span class="cline-any cline-neutral"> </span>
|
|
1440
1440
|
<span class="cline-any cline-neutral"> </span>
|
|
1441
|
-
<span class="cline-any cline-yes">
|
|
1442
|
-
<span class="cline-any cline-yes">
|
|
1443
|
-
<span class="cline-any cline-yes">
|
|
1441
|
+
<span class="cline-any cline-yes">11482x</span>
|
|
1442
|
+
<span class="cline-any cline-yes">11482x</span>
|
|
1443
|
+
<span class="cline-any cline-yes">11482x</span>
|
|
1444
1444
|
<span class="cline-any cline-neutral"> </span>
|
|
1445
|
-
<span class="cline-any cline-yes">
|
|
1446
|
-
<span class="cline-any cline-yes">
|
|
1445
|
+
<span class="cline-any cline-yes">11482x</span>
|
|
1446
|
+
<span class="cline-any cline-yes">7779x</span>
|
|
1447
1447
|
<span class="cline-any cline-neutral"> </span>
|
|
1448
1448
|
<span class="cline-any cline-neutral"> </span>
|
|
1449
|
-
<span class="cline-any cline-yes">
|
|
1449
|
+
<span class="cline-any cline-yes">3703x</span>
|
|
1450
1450
|
<span class="cline-any cline-neutral"> </span>
|
|
1451
|
-
<span class="cline-any cline-yes">
|
|
1452
|
-
<span class="cline-any cline-yes">
|
|
1451
|
+
<span class="cline-any cline-yes">3703x</span>
|
|
1452
|
+
<span class="cline-any cline-yes">3924x</span>
|
|
1453
1453
|
<span class="cline-any cline-neutral"> </span>
|
|
1454
|
-
<span class="cline-any cline-yes">
|
|
1455
|
-
<span class="cline-any cline-yes">
|
|
1454
|
+
<span class="cline-any cline-yes">23118x</span>
|
|
1455
|
+
<span class="cline-any cline-yes">2616x</span>
|
|
1456
1456
|
<span class="cline-any cline-neutral"> </span>
|
|
1457
1457
|
<span class="cline-any cline-neutral"> </span>
|
|
1458
1458
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -1460,13 +1460,13 @@
|
|
|
1460
1460
|
<span class="cline-any cline-neutral"> </span>
|
|
1461
1461
|
<span class="cline-any cline-neutral"> </span>
|
|
1462
1462
|
<span class="cline-any cline-neutral"> </span>
|
|
1463
|
-
<span class="cline-any cline-yes">
|
|
1463
|
+
<span class="cline-any cline-yes">20502x</span>
|
|
1464
1464
|
<span class="cline-any cline-neutral"> </span>
|
|
1465
1465
|
<span class="cline-any cline-neutral"> </span>
|
|
1466
1466
|
<span class="cline-any cline-neutral"> </span>
|
|
1467
1467
|
<span class="cline-any cline-neutral"> </span>
|
|
1468
|
-
<span class="cline-any cline-yes">
|
|
1469
|
-
<span class="cline-any cline-yes">
|
|
1468
|
+
<span class="cline-any cline-yes">1201x</span>
|
|
1469
|
+
<span class="cline-any cline-yes">3924x</span>
|
|
1470
1470
|
<span class="cline-any cline-neutral"> </span>
|
|
1471
1471
|
<span class="cline-any cline-neutral"> </span>
|
|
1472
1472
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -1475,25 +1475,25 @@
|
|
|
1475
1475
|
<span class="cline-any cline-neutral"> </span>
|
|
1476
1476
|
<span class="cline-any cline-neutral"> </span>
|
|
1477
1477
|
<span class="cline-any cline-neutral"> </span>
|
|
1478
|
-
<span class="cline-any cline-yes">
|
|
1479
|
-
<span class="cline-any cline-yes">
|
|
1478
|
+
<span class="cline-any cline-yes">15443x</span>
|
|
1479
|
+
<span class="cline-any cline-yes">2190x</span>
|
|
1480
1480
|
<span class="cline-any cline-neutral"> </span>
|
|
1481
1481
|
<span class="cline-any cline-neutral"> </span>
|
|
1482
1482
|
<span class="cline-any cline-neutral"> </span>
|
|
1483
|
-
<span class="cline-any cline-yes">
|
|
1483
|
+
<span class="cline-any cline-yes">2190x</span>
|
|
1484
1484
|
<span class="cline-any cline-neutral"> </span>
|
|
1485
1485
|
<span class="cline-any cline-neutral"> </span>
|
|
1486
1486
|
<span class="cline-any cline-neutral"> </span>
|
|
1487
1487
|
<span class="cline-any cline-neutral"> </span>
|
|
1488
|
-
<span class="cline-any cline-yes">
|
|
1489
|
-
<span class="cline-any cline-yes">
|
|
1488
|
+
<span class="cline-any cline-yes">28221x</span>
|
|
1489
|
+
<span class="cline-any cline-yes">26059x</span>
|
|
1490
1490
|
<span class="cline-any cline-neutral"> </span>
|
|
1491
1491
|
<span class="cline-any cline-neutral"> </span>
|
|
1492
1492
|
<span class="cline-any cline-neutral"> </span>
|
|
1493
1493
|
<span class="cline-any cline-neutral"> </span>
|
|
1494
1494
|
<span class="cline-any cline-neutral"> </span>
|
|
1495
|
-
<span class="cline-any cline-yes">
|
|
1496
|
-
<span class="cline-any cline-yes">
|
|
1495
|
+
<span class="cline-any cline-yes">15443x</span>
|
|
1496
|
+
<span class="cline-any cline-yes">15443x</span>
|
|
1497
1497
|
<span class="cline-any cline-neutral"> </span>
|
|
1498
1498
|
<span class="cline-any cline-neutral"> </span>
|
|
1499
1499
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -1505,39 +1505,39 @@
|
|
|
1505
1505
|
<span class="cline-any cline-neutral"> </span>
|
|
1506
1506
|
<span class="cline-any cline-neutral"> </span>
|
|
1507
1507
|
<span class="cline-any cline-neutral"> </span>
|
|
1508
|
-
<span class="cline-any cline-yes">
|
|
1509
|
-
<span class="cline-any cline-yes">
|
|
1508
|
+
<span class="cline-any cline-yes">46440x</span>
|
|
1509
|
+
<span class="cline-any cline-yes">7786x</span>
|
|
1510
1510
|
<span class="cline-any cline-neutral"> </span>
|
|
1511
1511
|
<span class="cline-any cline-neutral"> </span>
|
|
1512
1512
|
<span class="cline-any cline-neutral"> </span>
|
|
1513
|
-
<span class="cline-any cline-yes">
|
|
1513
|
+
<span class="cline-any cline-yes">16759x</span>
|
|
1514
1514
|
<span class="cline-any cline-neutral"> </span>
|
|
1515
1515
|
<span class="cline-any cline-neutral"> </span>
|
|
1516
1516
|
<span class="cline-any cline-neutral"> </span>
|
|
1517
|
-
<span class="cline-any cline-yes">
|
|
1518
|
-
<span class="cline-any cline-yes">
|
|
1519
|
-
<span class="cline-any cline-yes">
|
|
1520
|
-
<span class="cline-any cline-yes">
|
|
1517
|
+
<span class="cline-any cline-yes">38654x</span>
|
|
1518
|
+
<span class="cline-any cline-yes">15414x</span>
|
|
1519
|
+
<span class="cline-any cline-yes">23260x</span>
|
|
1520
|
+
<span class="cline-any cline-yes">23260x</span>
|
|
1521
1521
|
<span class="cline-any cline-neutral"> </span>
|
|
1522
1522
|
<span class="cline-any cline-neutral"> </span>
|
|
1523
|
-
<span class="cline-any cline-yes">
|
|
1523
|
+
<span class="cline-any cline-yes">23240x</span>
|
|
1524
1524
|
<span class="cline-any cline-neutral"> </span>
|
|
1525
1525
|
<span class="cline-any cline-neutral"> </span>
|
|
1526
1526
|
<span class="cline-any cline-neutral"> </span>
|
|
1527
|
-
<span class="cline-any cline-yes">
|
|
1528
|
-
<span class="cline-any cline-yes">
|
|
1529
|
-
<span class="cline-any cline-yes">
|
|
1527
|
+
<span class="cline-any cline-yes">23240x</span>
|
|
1528
|
+
<span class="cline-any cline-yes">17828x</span>
|
|
1529
|
+
<span class="cline-any cline-yes">19633x</span>
|
|
1530
1530
|
<span class="cline-any cline-neutral"> </span>
|
|
1531
1531
|
<span class="cline-any cline-neutral"> </span>
|
|
1532
|
-
<span class="cline-any cline-yes">
|
|
1532
|
+
<span class="cline-any cline-yes">23240x</span>
|
|
1533
1533
|
<span class="cline-any cline-neutral"> </span>
|
|
1534
1534
|
<span class="cline-any cline-neutral"> </span>
|
|
1535
1535
|
<span class="cline-any cline-neutral"> </span>
|
|
1536
|
-
<span class="cline-any cline-yes">
|
|
1536
|
+
<span class="cline-any cline-yes">11482x</span>
|
|
1537
1537
|
<span class="cline-any cline-neutral"> </span>
|
|
1538
|
-
<span class="cline-any cline-yes">
|
|
1538
|
+
<span class="cline-any cline-yes">11482x</span>
|
|
1539
1539
|
<span class="cline-any cline-neutral"> </span>
|
|
1540
|
-
<span class="cline-any cline-yes">
|
|
1540
|
+
<span class="cline-any cline-yes">11482x</span>
|
|
1541
1541
|
<span class="cline-any cline-neutral"> </span>
|
|
1542
1542
|
<span class="cline-any cline-neutral"> </span>
|
|
1543
1543
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -1546,83 +1546,83 @@
|
|
|
1546
1546
|
<span class="cline-any cline-neutral"> </span>
|
|
1547
1547
|
<span class="cline-any cline-neutral"> </span>
|
|
1548
1548
|
<span class="cline-any cline-neutral"> </span>
|
|
1549
|
-
<span class="cline-any cline-yes">
|
|
1550
|
-
<span class="cline-any cline-yes">
|
|
1551
|
-
<span class="cline-any cline-yes">
|
|
1549
|
+
<span class="cline-any cline-yes">11482x</span>
|
|
1550
|
+
<span class="cline-any cline-yes">5849246x</span>
|
|
1551
|
+
<span class="cline-any cline-yes">5849246x</span>
|
|
1552
1552
|
<span class="cline-any cline-neutral"> </span>
|
|
1553
1553
|
<span class="cline-any cline-neutral"> </span>
|
|
1554
1554
|
<span class="cline-any cline-neutral"> </span>
|
|
1555
|
-
<span class="cline-any cline-yes">
|
|
1556
|
-
<span class="cline-any cline-yes">
|
|
1555
|
+
<span class="cline-any cline-yes">15443x</span>
|
|
1556
|
+
<span class="cline-any cline-yes">15443x</span>
|
|
1557
1557
|
<span class="cline-any cline-neutral"> </span>
|
|
1558
|
-
<span class="cline-any cline-yes">
|
|
1558
|
+
<span class="cline-any cline-yes">15443x</span>
|
|
1559
1559
|
<span class="cline-any cline-neutral"> </span>
|
|
1560
|
-
<span class="cline-any cline-yes">
|
|
1561
|
-
<span class="cline-any cline-yes">
|
|
1560
|
+
<span class="cline-any cline-yes">15443x</span>
|
|
1561
|
+
<span class="cline-any cline-yes">11482x</span>
|
|
1562
1562
|
<span class="cline-any cline-neutral"> </span>
|
|
1563
1563
|
<span class="cline-any cline-neutral"> </span>
|
|
1564
1564
|
<span class="cline-any cline-neutral"> </span>
|
|
1565
1565
|
<span class="cline-any cline-neutral"> </span>
|
|
1566
|
-
<span class="cline-any cline-yes">
|
|
1566
|
+
<span class="cline-any cline-yes">6575392x</span>
|
|
1567
1567
|
<span class="cline-any cline-neutral"> </span>
|
|
1568
|
-
<span class="cline-any cline-yes">
|
|
1569
|
-
<span class="cline-any cline-yes">
|
|
1570
|
-
<span class="cline-any cline-yes">
|
|
1568
|
+
<span class="cline-any cline-yes">6575392x</span>
|
|
1569
|
+
<span class="cline-any cline-yes">25054127x</span>
|
|
1570
|
+
<span class="cline-any cline-yes">24051962x</span>
|
|
1571
1571
|
<span class="cline-any cline-neutral"> </span>
|
|
1572
1572
|
<span class="cline-any cline-neutral"> </span>
|
|
1573
1573
|
<span class="cline-any cline-neutral"> </span>
|
|
1574
|
-
<span class="cline-any cline-yes">
|
|
1574
|
+
<span class="cline-any cline-yes">6575392x</span>
|
|
1575
1575
|
<span class="cline-any cline-neutral"> </span>
|
|
1576
1576
|
<span class="cline-any cline-neutral"> </span>
|
|
1577
1577
|
<span class="cline-any cline-neutral"> </span>
|
|
1578
|
-
<span class="cline-any cline-yes">
|
|
1578
|
+
<span class="cline-any cline-yes">5849246x</span>
|
|
1579
1579
|
<span class="cline-any cline-neutral"> </span>
|
|
1580
|
-
<span class="cline-any cline-yes">
|
|
1581
|
-
<span class="cline-any cline-yes">
|
|
1580
|
+
<span class="cline-any cline-yes">5849246x</span>
|
|
1581
|
+
<span class="cline-any cline-yes">20961771x</span>
|
|
1582
1582
|
<span class="cline-any cline-neutral"> </span>
|
|
1583
1583
|
<span class="cline-any cline-neutral"> </span>
|
|
1584
|
-
<span class="cline-any cline-yes">
|
|
1584
|
+
<span class="cline-any cline-yes">5849246x</span>
|
|
1585
1585
|
<span class="cline-any cline-neutral"> </span>
|
|
1586
1586
|
<span class="cline-any cline-neutral"> </span>
|
|
1587
1587
|
<span class="cline-any cline-neutral"> </span>
|
|
1588
|
-
<span class="cline-any cline-yes">
|
|
1589
|
-
<span class="cline-any cline-yes">
|
|
1588
|
+
<span class="cline-any cline-yes">26925x</span>
|
|
1589
|
+
<span class="cline-any cline-yes">20385x</span>
|
|
1590
1590
|
<span class="cline-any cline-neutral"> </span>
|
|
1591
1591
|
<span class="cline-any cline-neutral"> </span>
|
|
1592
|
-
<span class="cline-any cline-yes">
|
|
1593
|
-
<span class="cline-any cline-yes">
|
|
1594
|
-
<span class="cline-any cline-yes">
|
|
1595
|
-
<span class="cline-any cline-yes">
|
|
1592
|
+
<span class="cline-any cline-yes">6540x</span>
|
|
1593
|
+
<span class="cline-any cline-yes">6540x</span>
|
|
1594
|
+
<span class="cline-any cline-yes">2600x</span>
|
|
1595
|
+
<span class="cline-any cline-yes">15099796x</span>
|
|
1596
1596
|
<span class="cline-any cline-neutral"> </span>
|
|
1597
|
-
<span class="cline-any cline-yes">
|
|
1598
|
-
<span class="cline-any cline-yes">
|
|
1597
|
+
<span class="cline-any cline-yes">5908775x</span>
|
|
1598
|
+
<span class="cline-any cline-yes">1249640x</span>
|
|
1599
1599
|
<span class="cline-any cline-neutral"> </span>
|
|
1600
|
-
<span class="cline-any cline-yes">
|
|
1600
|
+
<span class="cline-any cline-yes">1249640x</span>
|
|
1601
1601
|
<span class="cline-any cline-neutral"> </span>
|
|
1602
|
-
<span class="cline-any cline-yes">
|
|
1602
|
+
<span class="cline-any cline-yes">4659135x</span>
|
|
1603
1603
|
<span class="cline-any cline-neutral"> </span>
|
|
1604
1604
|
<span class="cline-any cline-neutral"> </span>
|
|
1605
1605
|
<span class="cline-any cline-neutral"> </span>
|
|
1606
|
-
<span class="cline-any cline-yes">
|
|
1606
|
+
<span class="cline-any cline-yes">2600x</span>
|
|
1607
1607
|
<span class="cline-any cline-neutral"> </span>
|
|
1608
|
-
<span class="cline-any cline-yes">
|
|
1608
|
+
<span class="cline-any cline-yes">6540x</span>
|
|
1609
1609
|
<span class="cline-any cline-neutral"> </span>
|
|
1610
1610
|
<span class="cline-any cline-neutral"> </span>
|
|
1611
1611
|
<span class="cline-any cline-neutral"> </span>
|
|
1612
|
-
<span class="cline-any cline-yes">
|
|
1612
|
+
<span class="cline-any cline-yes">1249640x</span>
|
|
1613
1613
|
<span class="cline-any cline-neutral"> </span>
|
|
1614
1614
|
<span class="cline-any cline-neutral"> </span>
|
|
1615
|
-
<span class="cline-any cline-yes">
|
|
1616
|
-
<span class="cline-any cline-yes">
|
|
1615
|
+
<span class="cline-any cline-yes">1248546x</span>
|
|
1616
|
+
<span class="cline-any cline-yes">1248546x</span>
|
|
1617
1617
|
<span class="cline-any cline-neutral"> </span>
|
|
1618
1618
|
<span class="cline-any cline-neutral"> </span>
|
|
1619
1619
|
<span class="cline-any cline-neutral"> </span>
|
|
1620
|
-
<span class="cline-any cline-
|
|
1621
|
-
<span class="cline-any cline-
|
|
1622
|
-
<span class="cline-any cline-
|
|
1620
|
+
<span class="cline-any cline-yes">1094x</span>
|
|
1621
|
+
<span class="cline-any cline-yes">5476x</span>
|
|
1622
|
+
<span class="cline-any cline-yes">2901x</span>
|
|
1623
1623
|
<span class="cline-any cline-neutral"> </span>
|
|
1624
1624
|
<span class="cline-any cline-neutral"> </span>
|
|
1625
|
-
<span class="cline-any cline-
|
|
1625
|
+
<span class="cline-any cline-yes">1094x</span>
|
|
1626
1626
|
<span class="cline-any cline-neutral"> </span>
|
|
1627
1627
|
<span class="cline-any cline-neutral"> </span>
|
|
1628
1628
|
<span class="cline-any cline-no"> </span>
|
|
@@ -1650,77 +1650,77 @@
|
|
|
1650
1650
|
<span class="cline-any cline-neutral"> </span>
|
|
1651
1651
|
<span class="cline-any cline-neutral"> </span>
|
|
1652
1652
|
<span class="cline-any cline-neutral"> </span>
|
|
1653
|
-
<span class="cline-any cline-yes">
|
|
1653
|
+
<span class="cline-any cline-yes">314751x</span>
|
|
1654
1654
|
<span class="cline-any cline-neutral"> </span>
|
|
1655
|
-
<span class="cline-any cline-yes">
|
|
1656
|
-
<span class="cline-any cline-yes">
|
|
1655
|
+
<span class="cline-any cline-yes">314751x</span>
|
|
1656
|
+
<span class="cline-any cline-yes">314751x</span>
|
|
1657
1657
|
<span class="cline-any cline-neutral"> </span>
|
|
1658
1658
|
<span class="cline-any cline-no"> </span>
|
|
1659
1659
|
<span class="cline-any cline-neutral"> </span>
|
|
1660
1660
|
<span class="cline-any cline-neutral"> </span>
|
|
1661
1661
|
<span class="cline-any cline-neutral"> </span>
|
|
1662
1662
|
<span class="cline-any cline-neutral"> </span>
|
|
1663
|
-
<span class="cline-any cline-yes">
|
|
1664
|
-
<span class="cline-any cline-yes">
|
|
1663
|
+
<span class="cline-any cline-yes">11482x</span>
|
|
1664
|
+
<span class="cline-any cline-yes">11482x</span>
|
|
1665
1665
|
<span class="cline-any cline-neutral"> </span>
|
|
1666
|
-
<span class="cline-any cline-yes">
|
|
1667
|
-
<span class="cline-any cline-yes">
|
|
1666
|
+
<span class="cline-any cline-yes">11482x</span>
|
|
1667
|
+
<span class="cline-any cline-yes">9185x</span>
|
|
1668
1668
|
<span class="cline-any cline-neutral"> </span>
|
|
1669
1669
|
<span class="cline-any cline-neutral"> </span>
|
|
1670
|
-
<span class="cline-any cline-yes">
|
|
1670
|
+
<span class="cline-any cline-yes">11482x</span>
|
|
1671
1671
|
<span class="cline-any cline-neutral"> </span>
|
|
1672
|
-
<span class="cline-any cline-yes">
|
|
1673
|
-
<span class="cline-any cline-yes">
|
|
1672
|
+
<span class="cline-any cline-yes">11482x</span>
|
|
1673
|
+
<span class="cline-any cline-yes">11482x</span>
|
|
1674
1674
|
<span class="cline-any cline-neutral"> </span>
|
|
1675
|
-
<span class="cline-any cline-yes">
|
|
1676
|
-
<span class="cline-any cline-
|
|
1677
|
-
<span class="cline-any cline-
|
|
1675
|
+
<span class="cline-any cline-yes">11482x</span>
|
|
1676
|
+
<span class="cline-any cline-yes">21x</span>
|
|
1677
|
+
<span class="cline-any cline-yes">21x</span>
|
|
1678
1678
|
<span class="cline-any cline-neutral"> </span>
|
|
1679
1679
|
<span class="cline-any cline-neutral"> </span>
|
|
1680
1680
|
<span class="cline-any cline-neutral"> </span>
|
|
1681
|
-
<span class="cline-any cline-
|
|
1681
|
+
<span class="cline-any cline-yes">21x</span>
|
|
1682
1682
|
<span class="cline-any cline-neutral"> </span>
|
|
1683
|
-
<span class="cline-any cline-
|
|
1684
|
-
<span class="cline-any cline-
|
|
1683
|
+
<span class="cline-any cline-yes">18x</span>
|
|
1684
|
+
<span class="cline-any cline-yes">18x</span>
|
|
1685
1685
|
<span class="cline-any cline-neutral"> </span>
|
|
1686
1686
|
<span class="cline-any cline-neutral"> </span>
|
|
1687
1687
|
<span class="cline-any cline-neutral"> </span>
|
|
1688
|
-
<span class="cline-any cline-
|
|
1688
|
+
<span class="cline-any cline-yes">21x</span>
|
|
1689
1689
|
<span class="cline-any cline-neutral"> </span>
|
|
1690
1690
|
<span class="cline-any cline-neutral"> </span>
|
|
1691
|
-
<span class="cline-any cline-yes">
|
|
1691
|
+
<span class="cline-any cline-yes">11482x</span>
|
|
1692
1692
|
<span class="cline-any cline-neutral"> </span>
|
|
1693
|
-
<span class="cline-any cline-yes">
|
|
1694
|
-
<span class="cline-any cline-yes">
|
|
1695
|
-
<span class="cline-any cline-yes">
|
|
1693
|
+
<span class="cline-any cline-yes">11503x</span>
|
|
1694
|
+
<span class="cline-any cline-yes">11482x</span>
|
|
1695
|
+
<span class="cline-any cline-yes">11482x</span>
|
|
1696
1696
|
<span class="cline-any cline-neutral"> </span>
|
|
1697
|
-
<span class="cline-any cline-yes">
|
|
1697
|
+
<span class="cline-any cline-yes">11482x</span>
|
|
1698
1698
|
<span class="cline-any cline-neutral"> </span>
|
|
1699
1699
|
<span class="cline-any cline-neutral"> </span>
|
|
1700
1700
|
<span class="cline-any cline-neutral"> </span>
|
|
1701
1701
|
<span class="cline-any cline-neutral"> </span>
|
|
1702
1702
|
<span class="cline-any cline-neutral"> </span>
|
|
1703
|
-
<span class="cline-any cline-yes">
|
|
1704
|
-
<span class="cline-any cline-
|
|
1703
|
+
<span class="cline-any cline-yes">64x</span>
|
|
1704
|
+
<span class="cline-any cline-yes">1x</span>
|
|
1705
1705
|
<span class="cline-any cline-neutral"> </span>
|
|
1706
1706
|
<span class="cline-any cline-neutral"> </span>
|
|
1707
|
-
<span class="cline-any cline-yes">
|
|
1707
|
+
<span class="cline-any cline-yes">305x</span>
|
|
1708
1708
|
<span class="cline-any cline-neutral"> </span>
|
|
1709
1709
|
<span class="cline-any cline-neutral"> </span>
|
|
1710
1710
|
<span class="cline-any cline-neutral"> </span>
|
|
1711
|
-
<span class="cline-any cline-yes">
|
|
1712
|
-
<span class="cline-any cline-yes">
|
|
1711
|
+
<span class="cline-any cline-yes">9206x</span>
|
|
1712
|
+
<span class="cline-any cline-yes">9206x</span>
|
|
1713
1713
|
<span class="cline-any cline-neutral"> </span>
|
|
1714
|
-
<span class="cline-any cline-yes">
|
|
1714
|
+
<span class="cline-any cline-yes">9206x</span>
|
|
1715
1715
|
<span class="cline-any cline-neutral"> </span>
|
|
1716
|
-
<span class="cline-any cline-yes">
|
|
1717
|
-
<span class="cline-any cline-yes">
|
|
1718
|
-
<span class="cline-any cline-yes">
|
|
1719
|
-
<span class="cline-any cline-
|
|
1720
|
-
<span class="cline-any cline-
|
|
1716
|
+
<span class="cline-any cline-yes">9206x</span>
|
|
1717
|
+
<span class="cline-any cline-yes">9206x</span>
|
|
1718
|
+
<span class="cline-any cline-yes">9206x</span>
|
|
1719
|
+
<span class="cline-any cline-yes">18x</span>
|
|
1720
|
+
<span class="cline-any cline-yes">18x</span>
|
|
1721
1721
|
<span class="cline-any cline-neutral"> </span>
|
|
1722
1722
|
<span class="cline-any cline-neutral"> </span>
|
|
1723
|
-
<span class="cline-any cline-yes">
|
|
1723
|
+
<span class="cline-any cline-yes">9188x</span>
|
|
1724
1724
|
<span class="cline-any cline-neutral"> </span>
|
|
1725
1725
|
<span class="cline-any cline-neutral"> </span>
|
|
1726
1726
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -1729,13 +1729,13 @@
|
|
|
1729
1729
|
<span class="cline-any cline-neutral"> </span>
|
|
1730
1730
|
<span class="cline-any cline-neutral"> </span>
|
|
1731
1731
|
<span class="cline-any cline-neutral"> </span>
|
|
1732
|
-
<span class="cline-any cline-yes">
|
|
1732
|
+
<span class="cline-any cline-yes">41245x</span>
|
|
1733
1733
|
<span class="cline-any cline-neutral"> </span>
|
|
1734
|
-
<span class="cline-any cline-yes">
|
|
1734
|
+
<span class="cline-any cline-yes">41245x</span>
|
|
1735
1735
|
<span class="cline-any cline-neutral"> </span>
|
|
1736
1736
|
<span class="cline-any cline-neutral"> </span>
|
|
1737
|
-
<span class="cline-any cline-yes">
|
|
1738
|
-
<span class="cline-any cline-yes">
|
|
1737
|
+
<span class="cline-any cline-yes">9188x</span>
|
|
1738
|
+
<span class="cline-any cline-yes">9188x</span>
|
|
1739
1739
|
<span class="cline-any cline-neutral"> </span>
|
|
1740
1740
|
<span class="cline-any cline-neutral"> </span>
|
|
1741
1741
|
<span class="cline-any cline-no"> </span>
|
|
@@ -1747,46 +1747,46 @@
|
|
|
1747
1747
|
<span class="cline-any cline-neutral"> </span>
|
|
1748
1748
|
<span class="cline-any cline-neutral"> </span>
|
|
1749
1749
|
<span class="cline-any cline-neutral"> </span>
|
|
1750
|
-
<span class="cline-any cline-yes">
|
|
1750
|
+
<span class="cline-any cline-yes">5524x</span>
|
|
1751
1751
|
<span class="cline-any cline-no"> </span>
|
|
1752
1752
|
<span class="cline-any cline-neutral"> </span>
|
|
1753
1753
|
<span class="cline-any cline-neutral"> </span>
|
|
1754
|
-
<span class="cline-any cline-yes">
|
|
1755
|
-
<span class="cline-any cline-yes">
|
|
1756
|
-
<span class="cline-any cline-yes">
|
|
1754
|
+
<span class="cline-any cline-yes">5524x</span>
|
|
1755
|
+
<span class="cline-any cline-yes">111742x</span>
|
|
1756
|
+
<span class="cline-any cline-yes">33456x</span>
|
|
1757
1757
|
<span class="cline-any cline-neutral"> </span>
|
|
1758
1758
|
<span class="cline-any cline-neutral"> </span>
|
|
1759
|
-
<span class="cline-any cline-yes">
|
|
1760
|
-
<span class="cline-any cline-yes">
|
|
1759
|
+
<span class="cline-any cline-yes">111742x</span>
|
|
1760
|
+
<span class="cline-any cline-yes">111742x</span>
|
|
1761
1761
|
<span class="cline-any cline-neutral"> </span>
|
|
1762
1762
|
<span class="cline-any cline-neutral"> </span>
|
|
1763
|
-
<span class="cline-any cline-yes">
|
|
1763
|
+
<span class="cline-any cline-yes">5524x</span>
|
|
1764
1764
|
<span class="cline-any cline-neutral"> </span>
|
|
1765
1765
|
<span class="cline-any cline-neutral"> </span>
|
|
1766
1766
|
<span class="cline-any cline-neutral"> </span>
|
|
1767
|
-
<span class="cline-any cline-yes">
|
|
1767
|
+
<span class="cline-any cline-yes">5524x</span>
|
|
1768
1768
|
<span class="cline-any cline-no"> </span>
|
|
1769
1769
|
<span class="cline-any cline-neutral"> </span>
|
|
1770
1770
|
<span class="cline-any cline-neutral"> </span>
|
|
1771
|
-
<span class="cline-any cline-yes">
|
|
1772
|
-
<span class="cline-any cline-yes">
|
|
1773
|
-
<span class="cline-any cline-yes">
|
|
1774
|
-
<span class="cline-any cline-yes">
|
|
1775
|
-
<span class="cline-any cline-yes">
|
|
1771
|
+
<span class="cline-any cline-yes">5524x</span>
|
|
1772
|
+
<span class="cline-any cline-yes">16597x</span>
|
|
1773
|
+
<span class="cline-any cline-yes">283725x</span>
|
|
1774
|
+
<span class="cline-any cline-yes">283725x</span>
|
|
1775
|
+
<span class="cline-any cline-yes">350974x</span>
|
|
1776
1776
|
<span class="cline-any cline-neutral"> </span>
|
|
1777
1777
|
<span class="cline-any cline-neutral"> </span>
|
|
1778
|
-
<span class="cline-any cline-yes">
|
|
1779
|
-
<span class="cline-any cline-yes">
|
|
1778
|
+
<span class="cline-any cline-yes">283725x</span>
|
|
1779
|
+
<span class="cline-any cline-yes">200653x</span>
|
|
1780
1780
|
<span class="cline-any cline-neutral"> </span>
|
|
1781
|
-
<span class="cline-any cline-yes">
|
|
1781
|
+
<span class="cline-any cline-yes">83072x</span>
|
|
1782
1782
|
<span class="cline-any cline-neutral"> </span>
|
|
1783
1783
|
<span class="cline-any cline-neutral"> </span>
|
|
1784
1784
|
<span class="cline-any cline-neutral"> </span>
|
|
1785
1785
|
<span class="cline-any cline-neutral"> </span>
|
|
1786
|
-
<span class="cline-any cline-yes">
|
|
1786
|
+
<span class="cline-any cline-yes">5524x</span>
|
|
1787
1787
|
<span class="cline-any cline-neutral"> </span>
|
|
1788
1788
|
<span class="cline-any cline-neutral"> </span>
|
|
1789
|
-
<span class="cline-any cline-yes">
|
|
1789
|
+
<span class="cline-any cline-yes">5543x</span>
|
|
1790
1790
|
<span class="cline-any cline-neutral"> </span>
|
|
1791
1791
|
<span class="cline-any cline-neutral"> </span>
|
|
1792
1792
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -1802,7 +1802,7 @@ import * as Papa from 'papaparse';
|
|
|
1802
1802
|
import { utcParse } from 'd3-time-format';
|
|
1803
1803
|
import { IBaseReaderOptions, IDatapackage } from './interfaces';
|
|
1804
1804
|
|
|
1805
|
-
const isValidNumeric = val => typeof val !== 'number' && !val ?
|
|
1805
|
+
const isValidNumeric = val => typeof val !== 'number' && !val ? false : true;
|
|
1806
1806
|
|
|
1807
1807
|
export function ddfCsvReader (logger?: any) {
|
|
1808
1808
|
const internalConcepts = [
|
|
@@ -1813,7 +1813,7 @@ export function ddfCsvReader (logger?: any) {
|
|
|
1813
1813
|
const operators = new Map([
|
|
1814
1814
|
/* logical operators */
|
|
1815
1815
|
[ '$and', (row, predicates) => predicates.every(p => applyFilterRow(row, p)) ],
|
|
1816
|
-
[ '$or',
|
|
1816
|
+
[ '$or', (row, predicates) => predicates.some(p => applyFilterRow(row, p)) ],
|
|
1817
1817
|
[ '$not', <span class="fstat-no" title="function not covered" >(r</span>ow, predicate) => <span class="cstat-no" title="statement not covered" >!applyFilterRow(row, predicate) </span>],
|
|
1818
1818
|
[ '$nor', <span class="fstat-no" title="function not covered" >(r</span>ow, predicates) => <span class="cstat-no" title="statement not covered" >!predicates.some(<span class="fstat-no" title="function not covered" >p </span>=> <span class="cstat-no" title="statement not covered" >applyFilterRow(row, p))</span> </span>],
|
|
1819
1819
|
|
|
@@ -1823,9 +1823,9 @@ export function ddfCsvReader (logger?: any) {
|
|
|
1823
1823
|
[ '$gt', (rowValue, filterValue) => isValidNumeric(rowValue) && rowValue > filterValue ],
|
|
1824
1824
|
[ '$gte', <span class="fstat-no" title="function not covered" >(r</span>owValue, filterValue) => <span class="cstat-no" title="statement not covered" >isValidNumeric(rowValue) && rowValue >= filterValue </span>],
|
|
1825
1825
|
[ '$lt', (rowValue, filterValue) => isValidNumeric(rowValue) && rowValue < filterValue ],
|
|
1826
|
-
[ '$lte',
|
|
1826
|
+
[ '$lte', (rowValue, filterValue) => isValidNumeric(rowValue) && rowValue <= filterValue ],
|
|
1827
1827
|
[ '$in', (rowValue, filterValue) => filterValue.has(rowValue) ],
|
|
1828
|
-
[ '$nin',
|
|
1828
|
+
[ '$nin', (rowValue, filterValue) => !filterValue.has(rowValue) ],
|
|
1829
1829
|
]);
|
|
1830
1830
|
|
|
1831
1831
|
const keyValueLookup = new Map<string, any>();
|
|
@@ -1973,13 +1973,13 @@ export function ddfCsvReader (logger?: any) {
|
|
|
1973
1973
|
} else {
|
|
1974
1974
|
const appropriatePlugin = getAppropriatePlugin(queryParam, baseOptions);
|
|
1975
1975
|
|
|
1976
|
-
|
|
1977
|
-
|
|
1978
|
-
const files =
|
|
1979
|
-
|
|
1980
|
-
|
|
1976
|
+
if (appropriatePlugin) {
|
|
1977
|
+
optimalFilesSet = [];
|
|
1978
|
+
const files = await appropriatePlugin.getRecommendedFilesSet();
|
|
1979
|
+
optimalFilesSet = files;
|
|
1980
|
+
queryParam.optimalFilesSet = [].concat(files, queryParam.optimalFilesSet);
|
|
1981
1981
|
|
|
1982
|
-
|
|
1982
|
+
warning('get custom optimal files list by a plugin', optimalFilesSet);
|
|
1983
1983
|
}
|
|
1984
1984
|
|
|
1985
1985
|
data = await queryData(queryParam, baseOptions);
|
|
@@ -2049,7 +2049,7 @@ export function ddfCsvReader (logger?: any) {
|
|
|
2049
2049
|
*/
|
|
2050
2050
|
function parseTime(result, options: IBaseReaderOptions) {
|
|
2051
2051
|
const conceptsLookup = options.conceptsLookup;
|
|
2052
|
-
const concepts = Object.keys(result[0] ||
|
|
2052
|
+
const concepts = Object.keys(result[0] || {});
|
|
2053
2053
|
const timeConcepts = concepts.map(c => conceptsLookup.get(c) || {}).filter(co => co.concept_type == 'time');
|
|
2054
2054
|
timeConcepts.forEach(({ concept }) => {
|
|
2055
2055
|
const parse = getTimeParser(concept, options);
|
|
@@ -2089,9 +2089,9 @@ export function ddfCsvReader (logger?: any) {
|
|
|
2089
2089
|
if (concept == 'time') {
|
|
2090
2090
|
return tryParse;
|
|
2091
2091
|
}
|
|
2092
|
-
|
|
2093
|
-
|
|
2094
|
-
|
|
2092
|
+
if (!parsers[concept]) {
|
|
2093
|
+
error('No time parser found for time concept: ' + concept);
|
|
2094
|
+
return str => str;
|
|
2095
2095
|
}
|
|
2096
2096
|
return parsers[concept];
|
|
2097
2097
|
}
|
|
@@ -2103,13 +2103,13 @@ export function ddfCsvReader (logger?: any) {
|
|
|
2103
2103
|
|
|
2104
2104
|
// process ["geo"] or [{"geo": "asc"}] to [{ concept: "geo", direction: 1 }];
|
|
2105
2105
|
const orderNormalized = orderBy.map(orderPart => {
|
|
2106
|
-
|
|
2106
|
+
if (typeof orderPart === 'string') {
|
|
2107
2107
|
return { concept: orderPart, direction: 1 };
|
|
2108
2108
|
} else {
|
|
2109
|
-
const concept =
|
|
2110
|
-
const direction = (
|
|
2109
|
+
const concept = Object.keys(orderPart)[ 0 ];
|
|
2110
|
+
const direction = (orderPart[ concept ] === 'asc' ? 1 : -1);
|
|
2111
2111
|
|
|
2112
|
-
|
|
2112
|
+
return { concept, direction };
|
|
2113
2113
|
}
|
|
2114
2114
|
});
|
|
2115
2115
|
|
|
@@ -2191,8 +2191,8 @@ export function ddfCsvReader (logger?: any) {
|
|
|
2191
2191
|
|
|
2192
2192
|
const collection = queryParam.from.split('.')[ 0 ];
|
|
2193
2193
|
|
|
2194
|
-
|
|
2195
|
-
|
|
2194
|
+
if (baseOptions.datapackage.ddfSchema[ collection ]) {
|
|
2195
|
+
return getSchemaFromCollection(collection);
|
|
2196
2196
|
} else <span class="missing-if-branch" title="else path not taken" >E</span>if (collection === '*') {
|
|
2197
2197
|
return Object.keys(baseOptions.datapackage.ddfSchema)
|
|
2198
2198
|
.map(getSchemaFromCollection)
|
|
@@ -2327,8 +2327,8 @@ export function ddfCsvReader (logger?: any) {
|
|
|
2327
2327
|
return resourceKeySet.has(lookupConcept.concept) &&
|
|
2328
2328
|
lookupConcept.concept !== concept.concept && // not the actual concept
|
|
2329
2329
|
(
|
|
2330
|
-
|
|
2331
|
-
|
|
2330
|
+
lookupConcept.domain === concept.domain || // other entity sets in entity domain
|
|
2331
|
+
lookupConcept.concept === concept.domain // entity domain of the entity set
|
|
2332
2332
|
);
|
|
2333
2333
|
} else {
|
|
2334
2334
|
// concept_type == "entity_domain"
|
|
@@ -2398,7 +2398,7 @@ export function ddfCsvReader (logger?: any) {
|
|
|
2398
2398
|
|
|
2399
2399
|
if (oneKeyOneValueResourcesArray) {
|
|
2400
2400
|
oneKeyOneValueResourcesArray = oneKeyOneValueResourcesArray
|
|
2401
|
-
.filter(v => isEmpty(optimalFilesSet) ||
|
|
2401
|
+
.filter(v => isEmpty(optimalFilesSet) || includes(optimalFilesSet, v.path));
|
|
2402
2402
|
}
|
|
2403
2403
|
|
|
2404
2404
|
return new Set(oneKeyOneValueResourcesArray);
|
|
@@ -2486,15 +2486,15 @@ export function ddfCsvReader (logger?: any) {
|
|
|
2486
2486
|
/* Simple alternative without empty value or error handling */
|
|
2487
2487
|
Object.assign(resultRow, sourceRow);
|
|
2488
2488
|
break;
|
|
2489
|
-
|
|
2489
|
+
case 'translation':
|
|
2490
2490
|
// Translation joining ignores empty values
|
|
2491
2491
|
// and allows different values for strings (= translations)
|
|
2492
|
-
|
|
2493
|
-
|
|
2494
|
-
|
|
2492
|
+
for (const concept in sourceRow) {
|
|
2493
|
+
if (sourceRow[ concept ] !== '') {
|
|
2494
|
+
resultRow[ concept ] = sourceRow[ concept ];
|
|
2495
2495
|
}
|
|
2496
2496
|
}
|
|
2497
|
-
|
|
2497
|
+
break;
|
|
2498
2498
|
<span class="branch-2 cbranch-no" title="branch not covered" > case 'overwriteWithError':</span>
|
|
2499
2499
|
/* Alternative for "overwrite" with JOIN error detection */
|
|
2500
2500
|
<span class="cstat-no" title="statement not covered" > for (const concept in sourceRow) {</span>
|
|
@@ -2544,25 +2544,25 @@ export function ddfCsvReader (logger?: any) {
|
|
|
2544
2544
|
const languageValid = typeof language !== 'undefined' && includes(getLanguages(options), language);
|
|
2545
2545
|
const languageLoaded = typeof resource.translations[ language ] !== 'undefined';
|
|
2546
2546
|
|
|
2547
|
-
|
|
2548
|
-
<span class="
|
|
2549
|
-
const translationPath =
|
|
2547
|
+
if (languageValid) {
|
|
2548
|
+
<span class="missing-if-branch" title="else path not taken" >E</span>if (!languageLoaded) {
|
|
2549
|
+
const translationPath = `lang/${language}/${resource.path}`;
|
|
2550
2550
|
|
|
2551
2551
|
// error loading translation file is expected when specific file is not translated
|
|
2552
2552
|
// more correct would be to only resolve file-not-found errors but current solution is sufficient
|
|
2553
|
-
|
|
2554
|
-
.catch(
|
|
2555
|
-
|
|
2556
|
-
|
|
2553
|
+
resource.translations[ language ] = loadFile(translationPath, options)
|
|
2554
|
+
.catch(err => {
|
|
2555
|
+
warning(`translation file ${translationPath}`, err);
|
|
2556
|
+
return Promise.resolve({});
|
|
2557
2557
|
});
|
|
2558
2558
|
}
|
|
2559
2559
|
|
|
2560
|
-
|
|
2560
|
+
filePromises.push(resource.translations[ language ]);
|
|
2561
2561
|
}
|
|
2562
2562
|
|
|
2563
2563
|
return Promise.all(filePromises).then(fileResponses => {
|
|
2564
2564
|
// resp.data does not exist if translation file not found
|
|
2565
|
-
const filesData = fileResponses.map(resp => resp.data ||
|
|
2565
|
+
const filesData = fileResponses.map(resp => resp.data || []);
|
|
2566
2566
|
const primaryKey = resource.schema.primaryKey;
|
|
2567
2567
|
const data = joinData(primaryKey, 'translation', ...filesData);
|
|
2568
2568
|
|
|
@@ -2572,8 +2572,8 @@ export function ddfCsvReader (logger?: any) {
|
|
|
2572
2572
|
}
|
|
2573
2573
|
|
|
2574
2574
|
function getLanguages (options: {datapackage}): string[] {
|
|
2575
|
-
|
|
2576
|
-
|
|
2575
|
+
if (!options.datapackage.translations) {
|
|
2576
|
+
return [];
|
|
2577
2577
|
}
|
|
2578
2578
|
|
|
2579
2579
|
return options.datapackage.translations.map(lang => lang.id);
|
|
@@ -2587,9 +2587,9 @@ export function ddfCsvReader (logger?: any) {
|
|
|
2587
2587
|
|
|
2588
2588
|
return new Promise((resolve, reject) => {
|
|
2589
2589
|
options.fileReader.readText(fullFilePath, (err, data) => {
|
|
2590
|
-
|
|
2591
|
-
|
|
2592
|
-
|
|
2590
|
+
if (err) {
|
|
2591
|
+
error(`fail "${filePath}" reading`, err);
|
|
2592
|
+
return reject(new DdfCsvError(FILE_READING_ERROR, err, fullFilePath));
|
|
2593
2593
|
}
|
|
2594
2594
|
|
|
2595
2595
|
Papa.parse(stripBom(data), {
|
|
@@ -2668,7 +2668,7 @@ export function ddfCsvReader (logger?: any) {
|
|
|
2668
2668
|
</div><!-- /wrapper -->
|
|
2669
2669
|
<div class='footer quiet pad2 space-top1 center small'>
|
|
2670
2670
|
Code coverage
|
|
2671
|
-
generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at
|
|
2671
|
+
generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Wed Feb 08 2023 02:54:16 GMT+0300 (Moscow Standard Time)
|
|
2672
2672
|
</div>
|
|
2673
2673
|
</div>
|
|
2674
2674
|
<script src="../prettify.js"></script>
|