@kalisio/kdk 2.5.1 → 2.5.3
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/core/api/hooks/hooks.authorisations.js +1 -2
- package/core/api/services/authorisations/authorisations.service.js +1 -3
- package/core/api/services/index.js +5 -1
- package/core/api/services/users/users.hooks.js +4 -3
- package/core/client/components/input/KShapePicker.vue +4 -4
- package/core/client/utils/index.js +1 -0
- package/coverage/core/api/application.js.html +344 -344
- package/coverage/core/api/authentication.js.html +79 -79
- package/coverage/core/api/db.js.html +167 -167
- package/coverage/core/api/hooks/hooks.authentication.js.html +12 -12
- package/coverage/core/api/hooks/hooks.authorisations.js.html +154 -157
- package/coverage/core/api/hooks/hooks.logger.js.html +18 -18
- package/coverage/core/api/hooks/hooks.model.js.html +275 -275
- package/coverage/core/api/hooks/hooks.push.js.html +34 -34
- package/coverage/core/api/hooks/hooks.query.js.html +89 -89
- package/coverage/core/api/hooks/hooks.schemas.js.html +13 -13
- package/coverage/core/api/hooks/hooks.service.js.html +28 -28
- package/coverage/core/api/hooks/hooks.storage.js.html +7 -7
- package/coverage/core/api/hooks/hooks.users.js.html +50 -50
- package/coverage/core/api/hooks/index.html +51 -51
- package/coverage/core/api/hooks/index.js.html +11 -11
- package/coverage/core/api/index.html +42 -42
- package/coverage/core/api/index.js.html +22 -22
- package/coverage/core/api/marshall.js.html +127 -127
- package/coverage/core/api/models/index.html +1 -1
- package/coverage/core/api/models/messages.model.mongodb.js.html +1 -1
- package/coverage/core/api/models/users.model.mongodb.js.html +11 -11
- package/coverage/core/api/services/account/account.hooks.js.html +42 -42
- package/coverage/core/api/services/account/account.service.js.html +34 -34
- package/coverage/core/api/services/account/index.html +1 -1
- package/coverage/core/api/services/authorisations/authorisations.hooks.js.html +34 -34
- package/coverage/core/api/services/authorisations/authorisations.service.js.html +87 -93
- package/coverage/core/api/services/authorisations/index.html +19 -19
- package/coverage/core/api/services/databases/databases.hooks.js.html +1 -1
- package/coverage/core/api/services/databases/databases.service.js.html +1 -1
- package/coverage/core/api/services/databases/index.html +1 -1
- package/coverage/core/api/services/import-export/import-export.hooks.js.html +1 -1
- package/coverage/core/api/services/import-export/import-export.service.js.html +1 -1
- package/coverage/core/api/services/import-export/index.html +1 -1
- package/coverage/core/api/services/index.html +15 -15
- package/coverage/core/api/services/index.js.html +97 -85
- package/coverage/core/api/services/mailer/index.html +1 -1
- package/coverage/core/api/services/mailer/mailer.hooks.js.html +1 -1
- package/coverage/core/api/services/mailer/mailer.service.js.html +1 -1
- package/coverage/core/api/services/messages/index.html +1 -1
- package/coverage/core/api/services/messages/messages.hooks.js.html +1 -1
- package/coverage/core/api/services/push/index.html +1 -1
- package/coverage/core/api/services/push/push.hooks.js.html +1 -1
- package/coverage/core/api/services/push/push.service.js.html +1 -1
- package/coverage/core/api/services/storage/index.html +1 -1
- package/coverage/core/api/services/storage/storage.hooks.js.html +36 -36
- package/coverage/core/api/services/storage/storage.service.js.html +30 -30
- package/coverage/core/api/services/users/index.html +7 -7
- package/coverage/core/api/services/users/users.hooks.js.html +83 -80
- package/coverage/core/api/services/users/users.service.js.html +4 -4
- package/coverage/core/common/errors.js.html +2 -2
- package/coverage/core/common/index.html +30 -30
- package/coverage/core/common/index.js.html +11 -11
- package/coverage/core/common/permissions.js.html +187 -187
- package/coverage/core/common/schema.js.html +26 -26
- package/coverage/core/common/utils.js.html +61 -61
- package/coverage/core/common/utils.offline.js.html +6 -6
- package/coverage/index.html +173 -173
- package/coverage/lcov-report/core/api/application.js.html +344 -344
- package/coverage/lcov-report/core/api/authentication.js.html +79 -79
- package/coverage/lcov-report/core/api/db.js.html +167 -167
- package/coverage/lcov-report/core/api/hooks/hooks.authentication.js.html +12 -12
- package/coverage/lcov-report/core/api/hooks/hooks.authorisations.js.html +154 -157
- package/coverage/lcov-report/core/api/hooks/hooks.logger.js.html +18 -18
- package/coverage/lcov-report/core/api/hooks/hooks.model.js.html +275 -275
- package/coverage/lcov-report/core/api/hooks/hooks.push.js.html +34 -34
- package/coverage/lcov-report/core/api/hooks/hooks.query.js.html +89 -89
- package/coverage/lcov-report/core/api/hooks/hooks.schemas.js.html +13 -13
- package/coverage/lcov-report/core/api/hooks/hooks.service.js.html +28 -28
- package/coverage/lcov-report/core/api/hooks/hooks.storage.js.html +7 -7
- package/coverage/lcov-report/core/api/hooks/hooks.users.js.html +50 -50
- package/coverage/lcov-report/core/api/hooks/index.html +51 -51
- package/coverage/lcov-report/core/api/hooks/index.js.html +11 -11
- package/coverage/lcov-report/core/api/index.html +42 -42
- package/coverage/lcov-report/core/api/index.js.html +22 -22
- package/coverage/lcov-report/core/api/marshall.js.html +127 -127
- package/coverage/lcov-report/core/api/models/index.html +1 -1
- package/coverage/lcov-report/core/api/models/messages.model.mongodb.js.html +1 -1
- package/coverage/lcov-report/core/api/models/users.model.mongodb.js.html +11 -11
- package/coverage/lcov-report/core/api/services/account/account.hooks.js.html +42 -42
- package/coverage/lcov-report/core/api/services/account/account.service.js.html +34 -34
- package/coverage/lcov-report/core/api/services/account/index.html +1 -1
- package/coverage/lcov-report/core/api/services/authorisations/authorisations.hooks.js.html +34 -34
- package/coverage/lcov-report/core/api/services/authorisations/authorisations.service.js.html +87 -93
- package/coverage/lcov-report/core/api/services/authorisations/index.html +19 -19
- package/coverage/lcov-report/core/api/services/databases/databases.hooks.js.html +1 -1
- package/coverage/lcov-report/core/api/services/databases/databases.service.js.html +1 -1
- package/coverage/lcov-report/core/api/services/databases/index.html +1 -1
- package/coverage/lcov-report/core/api/services/import-export/import-export.hooks.js.html +1 -1
- package/coverage/lcov-report/core/api/services/import-export/import-export.service.js.html +1 -1
- package/coverage/lcov-report/core/api/services/import-export/index.html +1 -1
- package/coverage/lcov-report/core/api/services/index.html +15 -15
- package/coverage/lcov-report/core/api/services/index.js.html +97 -85
- package/coverage/lcov-report/core/api/services/mailer/index.html +1 -1
- package/coverage/lcov-report/core/api/services/mailer/mailer.hooks.js.html +1 -1
- package/coverage/lcov-report/core/api/services/mailer/mailer.service.js.html +1 -1
- package/coverage/lcov-report/core/api/services/messages/index.html +1 -1
- package/coverage/lcov-report/core/api/services/messages/messages.hooks.js.html +1 -1
- package/coverage/lcov-report/core/api/services/push/index.html +1 -1
- package/coverage/lcov-report/core/api/services/push/push.hooks.js.html +1 -1
- package/coverage/lcov-report/core/api/services/push/push.service.js.html +1 -1
- package/coverage/lcov-report/core/api/services/storage/index.html +1 -1
- package/coverage/lcov-report/core/api/services/storage/storage.hooks.js.html +36 -36
- package/coverage/lcov-report/core/api/services/storage/storage.service.js.html +30 -30
- package/coverage/lcov-report/core/api/services/users/index.html +7 -7
- package/coverage/lcov-report/core/api/services/users/users.hooks.js.html +83 -80
- package/coverage/lcov-report/core/api/services/users/users.service.js.html +4 -4
- package/coverage/lcov-report/core/common/errors.js.html +2 -2
- package/coverage/lcov-report/core/common/index.html +30 -30
- package/coverage/lcov-report/core/common/index.js.html +11 -11
- package/coverage/lcov-report/core/common/permissions.js.html +187 -187
- package/coverage/lcov-report/core/common/schema.js.html +26 -26
- package/coverage/lcov-report/core/common/utils.js.html +61 -61
- package/coverage/lcov-report/core/common/utils.offline.js.html +6 -6
- package/coverage/lcov-report/index.html +173 -173
- package/coverage/lcov-report/map/api/hooks/hooks.catalog.js.html +316 -316
- package/coverage/lcov-report/map/api/hooks/hooks.features.js.html +218 -218
- package/coverage/lcov-report/map/api/hooks/hooks.query.js.html +798 -789
- package/coverage/lcov-report/map/api/hooks/index.html +54 -54
- package/coverage/lcov-report/map/api/hooks/index.js.html +16 -16
- package/coverage/lcov-report/map/api/index.html +32 -32
- package/coverage/lcov-report/map/api/index.js.html +46 -46
- package/coverage/lcov-report/map/api/marshall.js.html +72 -72
- package/coverage/lcov-report/map/api/models/alerts.model.mongodb.js.html +24 -24
- package/coverage/lcov-report/map/api/models/catalog.model.mongodb.js.html +44 -44
- package/coverage/lcov-report/map/api/models/features.model.mongodb.js.html +80 -80
- package/coverage/lcov-report/map/api/models/index.html +65 -65
- package/coverage/lcov-report/map/api/models/projects.model.mongodb.js.html +26 -26
- package/coverage/lcov-report/map/api/models/styles.model.mongodb.js.html +28 -28
- package/coverage/lcov-report/map/api/services/alerts/alerts.hooks.js.html +136 -136
- package/coverage/lcov-report/map/api/services/alerts/alerts.service.js.html +343 -343
- package/coverage/lcov-report/map/api/services/alerts/index.html +32 -32
- package/coverage/lcov-report/map/api/services/catalog/catalog.hooks.js.html +172 -172
- package/coverage/lcov-report/map/api/services/catalog/index.html +21 -21
- package/coverage/lcov-report/map/api/services/daptiles/daptiles.service.js.html +1 -1
- package/coverage/lcov-report/map/api/services/daptiles/index.html +1 -1
- package/coverage/lcov-report/map/api/services/features/features.hooks.js.html +160 -160
- package/coverage/lcov-report/map/api/services/features/features.service.js.html +117 -117
- package/coverage/lcov-report/map/api/services/features/index.html +31 -31
- package/coverage/lcov-report/map/api/services/index.html +21 -21
- package/coverage/lcov-report/map/api/services/index.js.html +334 -334
- package/coverage/lcov-report/map/api/services/projects/index.html +21 -21
- package/coverage/lcov-report/map/api/services/projects/projects.hooks.js.html +237 -237
- package/coverage/lcov-report/map/api/services/styles/index.html +21 -21
- package/coverage/lcov-report/map/api/services/styles/styles.hooks.js.html +84 -84
- package/coverage/lcov-report/map/common/dynamic-grid-source.js.html +68 -68
- package/coverage/lcov-report/map/common/errors.js.html +16 -16
- package/coverage/lcov-report/map/common/geotiff-grid-source.js.html +267 -267
- package/coverage/lcov-report/map/common/grid.js.html +554 -554
- package/coverage/lcov-report/map/common/index.html +159 -159
- package/coverage/lcov-report/map/common/index.js.html +68 -68
- package/coverage/lcov-report/map/common/meteo-model-grid-source.js.html +73 -73
- package/coverage/lcov-report/map/common/moment-utils.js.html +18 -18
- package/coverage/lcov-report/map/common/opendap-grid-source.js.html +484 -484
- package/coverage/lcov-report/map/common/opendap-utils.js.html +353 -353
- package/coverage/lcov-report/map/common/permissions.js.html +40 -40
- package/coverage/lcov-report/map/common/time-based-grid-source.js.html +59 -59
- package/coverage/lcov-report/map/common/tms-utils.js.html +1 -1
- package/coverage/lcov-report/map/common/wcs-grid-source.js.html +190 -190
- package/coverage/lcov-report/map/common/wcs-utils.js.html +338 -338
- package/coverage/lcov-report/map/common/weacast-grid-source.js.html +345 -345
- package/coverage/lcov-report/map/common/wfs-utils.js.html +1 -1
- package/coverage/lcov-report/map/common/wms-utils.js.html +1 -1
- package/coverage/lcov-report/map/common/wmts-utils.js.html +1 -1
- package/coverage/lcov.info +6880 -5908
- package/coverage/map/api/hooks/hooks.catalog.js.html +316 -316
- package/coverage/map/api/hooks/hooks.features.js.html +218 -218
- package/coverage/map/api/hooks/hooks.query.js.html +798 -789
- package/coverage/map/api/hooks/index.html +54 -54
- package/coverage/map/api/hooks/index.js.html +16 -16
- package/coverage/map/api/index.html +32 -32
- package/coverage/map/api/index.js.html +46 -46
- package/coverage/map/api/marshall.js.html +72 -72
- package/coverage/map/api/models/alerts.model.mongodb.js.html +24 -24
- package/coverage/map/api/models/catalog.model.mongodb.js.html +44 -44
- package/coverage/map/api/models/features.model.mongodb.js.html +80 -80
- package/coverage/map/api/models/index.html +65 -65
- package/coverage/map/api/models/projects.model.mongodb.js.html +26 -26
- package/coverage/map/api/models/styles.model.mongodb.js.html +28 -28
- package/coverage/map/api/services/alerts/alerts.hooks.js.html +136 -136
- package/coverage/map/api/services/alerts/alerts.service.js.html +343 -343
- package/coverage/map/api/services/alerts/index.html +32 -32
- package/coverage/map/api/services/catalog/catalog.hooks.js.html +172 -172
- package/coverage/map/api/services/catalog/index.html +21 -21
- package/coverage/map/api/services/daptiles/daptiles.service.js.html +1 -1
- package/coverage/map/api/services/daptiles/index.html +1 -1
- package/coverage/map/api/services/features/features.hooks.js.html +160 -160
- package/coverage/map/api/services/features/features.service.js.html +117 -117
- package/coverage/map/api/services/features/index.html +31 -31
- package/coverage/map/api/services/index.html +21 -21
- package/coverage/map/api/services/index.js.html +334 -334
- package/coverage/map/api/services/projects/index.html +21 -21
- package/coverage/map/api/services/projects/projects.hooks.js.html +237 -237
- package/coverage/map/api/services/styles/index.html +21 -21
- package/coverage/map/api/services/styles/styles.hooks.js.html +84 -84
- package/coverage/map/common/dynamic-grid-source.js.html +68 -68
- package/coverage/map/common/errors.js.html +16 -16
- package/coverage/map/common/geotiff-grid-source.js.html +267 -267
- package/coverage/map/common/grid.js.html +554 -554
- package/coverage/map/common/index.html +159 -159
- package/coverage/map/common/index.js.html +68 -68
- package/coverage/map/common/meteo-model-grid-source.js.html +73 -73
- package/coverage/map/common/moment-utils.js.html +18 -18
- package/coverage/map/common/opendap-grid-source.js.html +484 -484
- package/coverage/map/common/opendap-utils.js.html +353 -353
- package/coverage/map/common/permissions.js.html +40 -40
- package/coverage/map/common/time-based-grid-source.js.html +59 -59
- package/coverage/map/common/tms-utils.js.html +1 -1
- package/coverage/map/common/wcs-grid-source.js.html +190 -190
- package/coverage/map/common/wcs-utils.js.html +338 -338
- package/coverage/map/common/weacast-grid-source.js.html +345 -345
- package/coverage/map/common/wfs-utils.js.html +1 -1
- package/coverage/map/common/wms-utils.js.html +1 -1
- package/coverage/map/common/wmts-utils.js.html +1 -1
- package/coverage/tmp/coverage-151198-1753351220086-0.json +1 -0
- package/coverage/tmp/coverage-151210-1753351220070-0.json +1 -0
- package/coverage/tmp/coverage-151221-1753351129816-0.json +1 -0
- package/coverage/tmp/coverage-151233-1753351129803-0.json +1 -0
- package/coverage/tmp/coverage-151240-1753351129770-0.json +1 -0
- package/coverage/tmp/coverage-151307-1753351220058-0.json +1 -0
- package/coverage/tmp/coverage-151319-1753351220044-0.json +1 -0
- package/coverage/tmp/coverage-151326-1753351220010-0.json +1 -0
- package/map/api/hooks/hooks.query.js +7 -4
- package/map/api/services/styles/styles.hooks.js +1 -1
- package/map/client/components/KLayerEditor.vue +4 -0
- package/map/client/components/catalog/KLayerCategories.vue +2 -0
- package/map/client/components/stickies/KAttribution.vue +8 -7
- package/map/client/components/stickies/KLevelSlider.vue +10 -8
- package/map/client/components/styles/KStyleEditor.vue +1 -1
- package/map/client/components/styles/KStyleManager.vue +7 -1
- package/map/client/composables/highlight.js +5 -1
- package/map/client/i18n/map_en.json +4 -1
- package/map/client/i18n/map_fr.json +5 -2
- package/map/client/leaflet/utils/utils.geojson.js +5 -4
- package/map/client/mixins/globe/mixin.geojson-layers.js +11 -5
- package/map/client/mixins/mixin.activity.js +9 -0
- package/map/client/utils/utils.layers.js +0 -2
- package/package.json +1 -1
- package/test/api/core/index.test.js +49 -60
- package/test/api/core/push.test.js +1 -1
- package/test/api/core/test-log-2025-06-25.log +9 -0
- package/test/api/core/test-log-2025-07-24.log +44 -0
- package/test/api/map/test-log-2025-05-27.log +13 -0
- package/test/api/map/test-log-2025-06-23.log +7 -0
- package/test/api/map/test-log-2025-07-24.log +11 -0
- package/coverage/tmp/coverage-323534-1747828879483-0.json +0 -1
- package/coverage/tmp/coverage-323546-1747828879453-0.json +0 -1
- package/coverage/tmp/coverage-323557-1747828879439-0.json +0 -1
- package/coverage/tmp/coverage-323569-1747828879416-0.json +0 -1
- package/coverage/tmp/coverage-323576-1747828879390-0.json +0 -1
|
@@ -23,30 +23,30 @@
|
|
|
23
23
|
<div class='clearfix'>
|
|
24
24
|
|
|
25
25
|
<div class='fl pad1y space-right2'>
|
|
26
|
-
<span class="strong">
|
|
26
|
+
<span class="strong">94.29% </span>
|
|
27
27
|
<span class="quiet">Statements</span>
|
|
28
|
-
<span class='fraction'>
|
|
28
|
+
<span class='fraction'>380/403</span>
|
|
29
29
|
</div>
|
|
30
30
|
|
|
31
31
|
|
|
32
32
|
<div class='fl pad1y space-right2'>
|
|
33
|
-
<span class="strong">
|
|
33
|
+
<span class="strong">79.67% </span>
|
|
34
34
|
<span class="quiet">Branches</span>
|
|
35
|
-
<span class='fraction'>
|
|
35
|
+
<span class='fraction'>98/123</span>
|
|
36
36
|
</div>
|
|
37
37
|
|
|
38
38
|
|
|
39
39
|
<div class='fl pad1y space-right2'>
|
|
40
|
-
<span class="strong">
|
|
40
|
+
<span class="strong">100% </span>
|
|
41
41
|
<span class="quiet">Functions</span>
|
|
42
|
-
<span class='fraction'>
|
|
42
|
+
<span class='fraction'>6/6</span>
|
|
43
43
|
</div>
|
|
44
44
|
|
|
45
45
|
|
|
46
46
|
<div class='fl pad1y space-right2'>
|
|
47
|
-
<span class="strong">
|
|
47
|
+
<span class="strong">94.29% </span>
|
|
48
48
|
<span class="quiet">Lines</span>
|
|
49
|
-
<span class='fraction'>
|
|
49
|
+
<span class='fraction'>380/403</span>
|
|
50
50
|
</div>
|
|
51
51
|
|
|
52
52
|
|
|
@@ -61,7 +61,7 @@
|
|
|
61
61
|
</div>
|
|
62
62
|
</template>
|
|
63
63
|
</div>
|
|
64
|
-
<div class='status-line
|
|
64
|
+
<div class='status-line high'></div>
|
|
65
65
|
<pre><table class="coverage">
|
|
66
66
|
<tr><td class="line-count quiet"><a name='L1'></a><a href='#L1'>1</a>
|
|
67
67
|
<a name='L2'></a><a href='#L2'>2</a>
|
|
@@ -463,806 +463,815 @@
|
|
|
463
463
|
<a name='L398'></a><a href='#L398'>398</a>
|
|
464
464
|
<a name='L399'></a><a href='#L399'>399</a>
|
|
465
465
|
<a name='L400'></a><a href='#L400'>400</a>
|
|
466
|
-
<a name='L401'></a><a href='#L401'>401</a
|
|
467
|
-
<
|
|
468
|
-
<
|
|
469
|
-
<span class="cline-any cline-
|
|
470
|
-
<span class="cline-any cline-
|
|
471
|
-
<span class="cline-any cline-
|
|
472
|
-
<span class="cline-any cline-
|
|
473
|
-
<span class="cline-any cline-
|
|
474
|
-
<span class="cline-any cline-
|
|
475
|
-
<span class="cline-any cline-
|
|
476
|
-
<span class="cline-any cline-
|
|
477
|
-
<span class="cline-any cline-
|
|
478
|
-
<span class="cline-any cline-
|
|
479
|
-
<span class="cline-any cline-
|
|
480
|
-
<span class="cline-any cline-
|
|
481
|
-
<span class="cline-any cline-
|
|
482
|
-
<span class="cline-any cline-
|
|
483
|
-
<span class="cline-any cline-
|
|
484
|
-
<span class="cline-any cline-
|
|
485
|
-
<span class="cline-any cline-
|
|
486
|
-
<span class="cline-any cline-
|
|
487
|
-
<span class="cline-any cline-
|
|
488
|
-
<span class="cline-any cline-
|
|
489
|
-
<span class="cline-any cline-
|
|
490
|
-
<span class="cline-any cline-
|
|
491
|
-
<span class="cline-any cline-
|
|
492
|
-
<span class="cline-any cline-
|
|
493
|
-
<span class="cline-any cline-
|
|
494
|
-
<span class="cline-any cline-
|
|
495
|
-
<span class="cline-any cline-
|
|
496
|
-
<span class="cline-any cline-
|
|
497
|
-
<span class="cline-any cline-
|
|
498
|
-
<span class="cline-any cline-
|
|
499
|
-
<span class="cline-any cline-
|
|
500
|
-
<span class="cline-any cline-
|
|
501
|
-
<span class="cline-any cline-
|
|
502
|
-
<span class="cline-any cline-
|
|
503
|
-
<span class="cline-any cline-
|
|
504
|
-
<span class="cline-any cline-
|
|
505
|
-
<span class="cline-any cline-
|
|
506
|
-
<span class="cline-any cline-
|
|
507
|
-
<span class="cline-any cline-
|
|
508
|
-
<span class="cline-any cline-
|
|
509
|
-
<span class="cline-any cline-
|
|
510
|
-
<span class="cline-any cline-
|
|
511
|
-
<span class="cline-any cline-
|
|
512
|
-
<span class="cline-any cline-
|
|
513
|
-
<span class="cline-any cline-
|
|
514
|
-
<span class="cline-any cline-
|
|
515
|
-
<span class="cline-any cline-
|
|
516
|
-
<span class="cline-any cline-
|
|
517
|
-
<span class="cline-any cline-
|
|
518
|
-
<span class="cline-any cline-
|
|
519
|
-
<span class="cline-any cline-
|
|
520
|
-
<span class="cline-any cline-
|
|
521
|
-
<span class="cline-any cline-
|
|
522
|
-
<span class="cline-any cline-
|
|
523
|
-
<span class="cline-any cline-
|
|
524
|
-
<span class="cline-any cline-
|
|
525
|
-
<span class="cline-any cline-
|
|
526
|
-
<span class="cline-any cline-
|
|
527
|
-
<span class="cline-any cline-
|
|
528
|
-
<span class="cline-any cline-
|
|
529
|
-
<span class="cline-any cline-
|
|
530
|
-
<span class="cline-any cline-no"> </span>
|
|
531
|
-
<span class="cline-any cline-no"> </span>
|
|
532
|
-
<span class="cline-any cline-no"> </span>
|
|
533
|
-
<span class="cline-any cline-no"> </span>
|
|
534
|
-
<span class="cline-any cline-no"> </span>
|
|
535
|
-
<span class="cline-any cline-no"> </span>
|
|
536
|
-
<span class="cline-any cline-
|
|
537
|
-
<span class="cline-any cline-
|
|
538
|
-
<span class="cline-any cline-
|
|
539
|
-
<span class="cline-any cline-
|
|
540
|
-
<span class="cline-any cline-
|
|
541
|
-
<span class="cline-any cline-
|
|
542
|
-
<span class="cline-any cline-
|
|
543
|
-
<span class="cline-any cline-
|
|
544
|
-
<span class="cline-any cline-
|
|
545
|
-
<span class="cline-any cline-
|
|
546
|
-
<span class="cline-any cline-
|
|
547
|
-
<span class="cline-any cline-
|
|
548
|
-
<span class="cline-any cline-
|
|
549
|
-
<span class="cline-any cline-
|
|
550
|
-
<span class="cline-any cline-
|
|
551
|
-
<span class="cline-any cline-
|
|
552
|
-
<span class="cline-any cline-
|
|
553
|
-
<span class="cline-any cline-
|
|
554
|
-
<span class="cline-any cline-
|
|
555
|
-
<span class="cline-any cline-
|
|
556
|
-
<span class="cline-any cline-
|
|
557
|
-
<span class="cline-any cline-
|
|
558
|
-
<span class="cline-any cline-
|
|
559
|
-
<span class="cline-any cline-
|
|
560
|
-
<span class="cline-any cline-
|
|
561
|
-
<span class="cline-any cline-
|
|
562
|
-
<span class="cline-any cline-
|
|
563
|
-
<span class="cline-any cline-
|
|
564
|
-
<span class="cline-any cline-
|
|
565
|
-
<span class="cline-any cline-
|
|
566
|
-
<span class="cline-any cline-
|
|
567
|
-
<span class="cline-any cline-
|
|
568
|
-
<span class="cline-any cline-
|
|
569
|
-
<span class="cline-any cline-
|
|
570
|
-
<span class="cline-any cline-
|
|
571
|
-
<span class="cline-any cline-
|
|
572
|
-
<span class="cline-any cline-
|
|
573
|
-
<span class="cline-any cline-
|
|
574
|
-
<span class="cline-any cline-
|
|
575
|
-
<span class="cline-any cline-
|
|
576
|
-
<span class="cline-any cline-
|
|
577
|
-
<span class="cline-any cline-
|
|
578
|
-
<span class="cline-any cline-
|
|
579
|
-
<span class="cline-any cline-
|
|
580
|
-
<span class="cline-any cline-
|
|
581
|
-
<span class="cline-any cline-
|
|
582
|
-
<span class="cline-any cline-
|
|
583
|
-
<span class="cline-any cline-
|
|
584
|
-
<span class="cline-any cline-
|
|
585
|
-
<span class="cline-any cline-
|
|
586
|
-
<span class="cline-any cline-
|
|
587
|
-
<span class="cline-any cline-
|
|
588
|
-
<span class="cline-any cline-
|
|
589
|
-
<span class="cline-any cline-
|
|
590
|
-
<span class="cline-any cline-
|
|
591
|
-
<span class="cline-any cline-
|
|
592
|
-
<span class="cline-any cline-
|
|
593
|
-
<span class="cline-any cline-
|
|
594
|
-
<span class="cline-any cline-
|
|
595
|
-
<span class="cline-any cline-
|
|
596
|
-
<span class="cline-any cline-
|
|
597
|
-
<span class="cline-any cline-
|
|
598
|
-
<span class="cline-any cline-
|
|
599
|
-
<span class="cline-any cline-
|
|
600
|
-
<span class="cline-any cline-
|
|
601
|
-
<span class="cline-any cline-
|
|
602
|
-
<span class="cline-any cline-
|
|
603
|
-
<span class="cline-any cline-
|
|
604
|
-
<span class="cline-any cline-
|
|
605
|
-
<span class="cline-any cline-
|
|
606
|
-
<span class="cline-any cline-
|
|
607
|
-
<span class="cline-any cline-
|
|
608
|
-
<span class="cline-any cline-
|
|
609
|
-
<span class="cline-any cline-
|
|
610
|
-
<span class="cline-any cline-
|
|
611
|
-
<span class="cline-any cline-
|
|
612
|
-
<span class="cline-any cline-
|
|
613
|
-
<span class="cline-any cline-
|
|
614
|
-
<span class="cline-any cline-
|
|
615
|
-
<span class="cline-any cline-
|
|
616
|
-
<span class="cline-any cline-
|
|
617
|
-
<span class="cline-any cline-
|
|
618
|
-
<span class="cline-any cline-
|
|
619
|
-
<span class="cline-any cline-
|
|
620
|
-
<span class="cline-any cline-
|
|
621
|
-
<span class="cline-any cline-
|
|
622
|
-
<span class="cline-any cline-
|
|
623
|
-
<span class="cline-any cline-
|
|
624
|
-
<span class="cline-any cline-
|
|
625
|
-
<span class="cline-any cline-
|
|
626
|
-
<span class="cline-any cline-
|
|
627
|
-
<span class="cline-any cline-
|
|
628
|
-
<span class="cline-any cline-
|
|
629
|
-
<span class="cline-any cline-
|
|
630
|
-
<span class="cline-any cline-
|
|
631
|
-
<span class="cline-any cline-
|
|
632
|
-
<span class="cline-any cline-
|
|
633
|
-
<span class="cline-any cline-
|
|
634
|
-
<span class="cline-any cline-
|
|
635
|
-
<span class="cline-any cline-
|
|
636
|
-
<span class="cline-any cline-
|
|
637
|
-
<span class="cline-any cline-
|
|
638
|
-
<span class="cline-any cline-
|
|
639
|
-
<span class="cline-any cline-
|
|
640
|
-
<span class="cline-any cline-
|
|
641
|
-
<span class="cline-any cline-no"> </span>
|
|
642
|
-
<span class="cline-any cline-no"> </span>
|
|
643
|
-
<span class="cline-any cline-
|
|
644
|
-
<span class="cline-any cline-
|
|
645
|
-
<span class="cline-any cline-
|
|
646
|
-
<span class="cline-any cline-
|
|
647
|
-
<span class="cline-any cline-
|
|
648
|
-
<span class="cline-any cline-
|
|
649
|
-
<span class="cline-any cline-
|
|
650
|
-
<span class="cline-any cline-
|
|
651
|
-
<span class="cline-any cline-
|
|
652
|
-
<span class="cline-any cline-
|
|
653
|
-
<span class="cline-any cline-
|
|
654
|
-
<span class="cline-any cline-
|
|
655
|
-
<span class="cline-any cline-
|
|
656
|
-
<span class="cline-any cline-
|
|
657
|
-
<span class="cline-any cline-
|
|
658
|
-
<span class="cline-any cline-
|
|
659
|
-
<span class="cline-any cline-
|
|
660
|
-
<span class="cline-any cline-
|
|
661
|
-
<span class="cline-any cline-
|
|
662
|
-
<span class="cline-any cline-
|
|
663
|
-
<span class="cline-any cline-
|
|
664
|
-
<span class="cline-any cline-
|
|
665
|
-
<span class="cline-any cline-
|
|
666
|
-
<span class="cline-any cline-
|
|
667
|
-
<span class="cline-any cline-
|
|
668
|
-
<span class="cline-any cline-
|
|
669
|
-
<span class="cline-any cline-
|
|
670
|
-
<span class="cline-any cline-
|
|
671
|
-
<span class="cline-any cline-
|
|
672
|
-
<span class="cline-any cline-
|
|
673
|
-
<span class="cline-any cline-
|
|
674
|
-
<span class="cline-any cline-
|
|
675
|
-
<span class="cline-any cline-
|
|
676
|
-
<span class="cline-any cline-
|
|
677
|
-
<span class="cline-any cline-
|
|
678
|
-
<span class="cline-any cline-
|
|
679
|
-
<span class="cline-any cline-
|
|
680
|
-
<span class="cline-any cline-
|
|
681
|
-
<span class="cline-any cline-
|
|
682
|
-
<span class="cline-any cline-
|
|
683
|
-
<span class="cline-any cline-
|
|
684
|
-
<span class="cline-any cline-no"> </span>
|
|
685
|
-
<span class="cline-any cline-no"> </span>
|
|
686
|
-
<span class="cline-any cline-no"> </span>
|
|
687
|
-
<span class="cline-any cline-no"> </span>
|
|
688
|
-
<span class="cline-any cline-no"> </span>
|
|
689
|
-
<span class="cline-any cline-
|
|
690
|
-
<span class="cline-any cline-
|
|
691
|
-
<span class="cline-any cline-
|
|
692
|
-
<span class="cline-any cline-
|
|
693
|
-
<span class="cline-any cline-
|
|
694
|
-
<span class="cline-any cline-
|
|
695
|
-
<span class="cline-any cline-
|
|
696
|
-
<span class="cline-any cline-
|
|
697
|
-
<span class="cline-any cline-
|
|
698
|
-
<span class="cline-any cline-
|
|
699
|
-
<span class="cline-any cline-no"> </span>
|
|
700
|
-
<span class="cline-any cline-no"> </span>
|
|
701
|
-
<span class="cline-any cline-no"> </span>
|
|
702
|
-
<span class="cline-any cline-no"> </span>
|
|
703
|
-
<span class="cline-any cline-
|
|
704
|
-
<span class="cline-any cline-
|
|
705
|
-
<span class="cline-any cline-
|
|
706
|
-
<span class="cline-any cline-
|
|
707
|
-
<span class="cline-any cline-
|
|
708
|
-
<span class="cline-any cline-
|
|
709
|
-
<span class="cline-any cline-
|
|
710
|
-
<span class="cline-any cline-
|
|
711
|
-
<span class="cline-any cline-
|
|
712
|
-
<span class="cline-any cline-
|
|
713
|
-
<span class="cline-any cline-
|
|
714
|
-
<span class="cline-any cline-
|
|
715
|
-
<span class="cline-any cline-
|
|
716
|
-
<span class="cline-any cline-
|
|
717
|
-
<span class="cline-any cline-
|
|
718
|
-
<span class="cline-any cline-
|
|
719
|
-
<span class="cline-any cline-
|
|
720
|
-
<span class="cline-any cline-
|
|
721
|
-
<span class="cline-any cline-
|
|
722
|
-
<span class="cline-any cline-
|
|
723
|
-
<span class="cline-any cline-
|
|
724
|
-
<span class="cline-any cline-
|
|
725
|
-
<span class="cline-any cline-
|
|
726
|
-
<span class="cline-any cline-
|
|
727
|
-
<span class="cline-any cline-
|
|
728
|
-
<span class="cline-any cline-
|
|
729
|
-
<span class="cline-any cline-
|
|
730
|
-
<span class="cline-any cline-
|
|
731
|
-
<span class="cline-any cline-
|
|
732
|
-
<span class="cline-any cline-
|
|
733
|
-
<span class="cline-any cline-
|
|
734
|
-
<span class="cline-any cline-
|
|
735
|
-
<span class="cline-any cline-
|
|
736
|
-
<span class="cline-any cline-
|
|
737
|
-
<span class="cline-any cline-
|
|
738
|
-
<span class="cline-any cline-
|
|
739
|
-
<span class="cline-any cline-
|
|
740
|
-
<span class="cline-any cline-
|
|
741
|
-
<span class="cline-any cline-
|
|
742
|
-
<span class="cline-any cline-
|
|
743
|
-
<span class="cline-any cline-
|
|
744
|
-
<span class="cline-any cline-
|
|
745
|
-
<span class="cline-any cline-
|
|
746
|
-
<span class="cline-any cline-
|
|
747
|
-
<span class="cline-any cline-
|
|
748
|
-
<span class="cline-any cline-
|
|
749
|
-
<span class="cline-any cline-
|
|
750
|
-
<span class="cline-any cline-
|
|
751
|
-
<span class="cline-any cline-
|
|
752
|
-
<span class="cline-any cline-
|
|
753
|
-
<span class="cline-any cline-
|
|
754
|
-
<span class="cline-any cline-
|
|
755
|
-
<span class="cline-any cline-
|
|
756
|
-
<span class="cline-any cline-
|
|
757
|
-
<span class="cline-any cline-
|
|
758
|
-
<span class="cline-any cline-
|
|
759
|
-
<span class="cline-any cline-
|
|
760
|
-
<span class="cline-any cline-
|
|
761
|
-
<span class="cline-any cline-
|
|
762
|
-
<span class="cline-any cline-
|
|
763
|
-
<span class="cline-any cline-
|
|
764
|
-
<span class="cline-any cline-
|
|
765
|
-
<span class="cline-any cline-
|
|
766
|
-
<span class="cline-any cline-
|
|
767
|
-
<span class="cline-any cline-
|
|
768
|
-
<span class="cline-any cline-
|
|
769
|
-
<span class="cline-any cline-
|
|
770
|
-
<span class="cline-any cline-
|
|
771
|
-
<span class="cline-any cline-
|
|
772
|
-
<span class="cline-any cline-
|
|
773
|
-
<span class="cline-any cline-
|
|
774
|
-
<span class="cline-any cline-
|
|
775
|
-
<span class="cline-any cline-
|
|
776
|
-
<span class="cline-any cline-
|
|
777
|
-
<span class="cline-any cline-
|
|
778
|
-
<span class="cline-any cline-
|
|
779
|
-
<span class="cline-any cline-
|
|
780
|
-
<span class="cline-any cline-
|
|
781
|
-
<span class="cline-any cline-
|
|
782
|
-
<span class="cline-any cline-
|
|
783
|
-
<span class="cline-any cline-
|
|
784
|
-
<span class="cline-any cline-
|
|
785
|
-
<span class="cline-any cline-
|
|
786
|
-
<span class="cline-any cline-no"> </span>
|
|
787
|
-
<span class="cline-any cline-no"> </span>
|
|
788
|
-
<span class="cline-any cline-
|
|
789
|
-
<span class="cline-any cline-
|
|
790
|
-
<span class="cline-any cline-
|
|
791
|
-
<span class="cline-any cline-
|
|
792
|
-
<span class="cline-any cline-
|
|
793
|
-
<span class="cline-any cline-
|
|
794
|
-
<span class="cline-any cline-
|
|
795
|
-
<span class="cline-any cline-
|
|
796
|
-
<span class="cline-any cline-
|
|
797
|
-
<span class="cline-any cline-
|
|
798
|
-
<span class="cline-any cline-
|
|
799
|
-
<span class="cline-any cline-
|
|
800
|
-
<span class="cline-any cline-
|
|
801
|
-
<span class="cline-any cline-
|
|
802
|
-
<span class="cline-any cline-
|
|
803
|
-
<span class="cline-any cline-
|
|
804
|
-
<span class="cline-any cline-
|
|
805
|
-
<span class="cline-any cline-
|
|
806
|
-
<span class="cline-any cline-
|
|
807
|
-
<span class="cline-any cline-
|
|
808
|
-
<span class="cline-any cline-
|
|
809
|
-
<span class="cline-any cline-
|
|
810
|
-
<span class="cline-any cline-
|
|
811
|
-
<span class="cline-any cline-
|
|
812
|
-
<span class="cline-any cline-
|
|
813
|
-
<span class="cline-any cline-
|
|
814
|
-
<span class="cline-any cline-
|
|
815
|
-
<span class="cline-any cline-
|
|
816
|
-
<span class="cline-any cline-
|
|
817
|
-
<span class="cline-any cline-
|
|
818
|
-
<span class="cline-any cline-
|
|
819
|
-
<span class="cline-any cline-
|
|
820
|
-
<span class="cline-any cline-
|
|
821
|
-
<span class="cline-any cline-
|
|
822
|
-
<span class="cline-any cline-
|
|
823
|
-
<span class="cline-any cline-
|
|
824
|
-
<span class="cline-any cline-
|
|
825
|
-
<span class="cline-any cline-
|
|
826
|
-
<span class="cline-any cline-
|
|
827
|
-
<span class="cline-any cline-
|
|
828
|
-
<span class="cline-any cline-
|
|
829
|
-
<span class="cline-any cline-
|
|
830
|
-
<span class="cline-any cline-
|
|
831
|
-
<span class="cline-any cline-
|
|
832
|
-
<span class="cline-any cline-
|
|
833
|
-
<span class="cline-any cline-
|
|
834
|
-
<span class="cline-any cline-
|
|
835
|
-
<span class="cline-any cline-
|
|
836
|
-
<span class="cline-any cline-
|
|
837
|
-
<span class="cline-any cline-
|
|
838
|
-
<span class="cline-any cline-
|
|
839
|
-
<span class="cline-any cline-
|
|
840
|
-
<span class="cline-any cline-
|
|
841
|
-
<span class="cline-any cline-
|
|
842
|
-
<span class="cline-any cline-
|
|
843
|
-
<span class="cline-any cline-
|
|
844
|
-
<span class="cline-any cline-
|
|
845
|
-
<span class="cline-any cline-
|
|
846
|
-
<span class="cline-any cline-
|
|
847
|
-
<span class="cline-any cline-
|
|
848
|
-
<span class="cline-any cline-
|
|
849
|
-
<span class="cline-any cline-
|
|
850
|
-
<span class="cline-any cline-
|
|
851
|
-
<span class="cline-any cline-
|
|
852
|
-
<span class="cline-any cline-
|
|
853
|
-
<span class="cline-any cline-no"> </span>
|
|
854
|
-
<span class="cline-any cline-
|
|
855
|
-
<span class="cline-any cline-
|
|
856
|
-
<span class="cline-any cline-
|
|
857
|
-
<span class="cline-any cline-no"> </span>
|
|
858
|
-
<span class="cline-any cline-no"> </span>
|
|
859
|
-
<span class="cline-any cline-no"> </span>
|
|
860
|
-
<span class="cline-any cline-
|
|
861
|
-
<span class="cline-any cline-
|
|
862
|
-
<span class="cline-any cline-
|
|
863
|
-
<span class="cline-any cline-
|
|
864
|
-
<span class="cline-any cline-
|
|
865
|
-
<span class="cline-any cline-
|
|
866
|
-
<span class="cline-any cline-
|
|
867
|
-
<span class="
|
|
868
|
-
<span class="
|
|
869
|
-
<span class="
|
|
870
|
-
<span class="
|
|
871
|
-
<span class="
|
|
872
|
-
<span class="
|
|
873
|
-
|
|
874
|
-
|
|
875
|
-
|
|
876
|
-
|
|
877
|
-
|
|
878
|
-
|
|
879
|
-
|
|
880
|
-
<span class="
|
|
881
|
-
|
|
882
|
-
<span class="
|
|
883
|
-
|
|
884
|
-
|
|
885
|
-
|
|
886
|
-
|
|
887
|
-
|
|
888
|
-
|
|
889
|
-
|
|
890
|
-
|
|
891
|
-
|
|
892
|
-
|
|
893
|
-
|
|
894
|
-
|
|
895
|
-
|
|
896
|
-
|
|
897
|
-
|
|
898
|
-
|
|
899
|
-
|
|
900
|
-
|
|
901
|
-
|
|
902
|
-
|
|
903
|
-
|
|
904
|
-
|
|
905
|
-
|
|
906
|
-
|
|
907
|
-
|
|
908
|
-
|
|
909
|
-
|
|
910
|
-
|
|
911
|
-
|
|
912
|
-
|
|
913
|
-
|
|
914
|
-
|
|
915
|
-
|
|
916
|
-
|
|
917
|
-
|
|
918
|
-
|
|
919
|
-
|
|
920
|
-
|
|
921
|
-
|
|
922
|
-
<span class="
|
|
923
|
-
<span class="
|
|
924
|
-
|
|
925
|
-
|
|
926
|
-
|
|
466
|
+
<a name='L401'></a><a href='#L401'>401</a>
|
|
467
|
+
<a name='L402'></a><a href='#L402'>402</a>
|
|
468
|
+
<a name='L403'></a><a href='#L403'>403</a>
|
|
469
|
+
<a name='L404'></a><a href='#L404'>404</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">1x</span>
|
|
470
|
+
<span class="cline-any cline-yes">1x</span>
|
|
471
|
+
<span class="cline-any cline-yes">1x</span>
|
|
472
|
+
<span class="cline-any cline-yes">1x</span>
|
|
473
|
+
<span class="cline-any cline-yes">1x</span>
|
|
474
|
+
<span class="cline-any cline-yes">1x</span>
|
|
475
|
+
<span class="cline-any cline-yes">1x</span>
|
|
476
|
+
<span class="cline-any cline-yes">2x</span>
|
|
477
|
+
<span class="cline-any cline-yes">2x</span>
|
|
478
|
+
<span class="cline-any cline-yes">2x</span>
|
|
479
|
+
<span class="cline-any cline-yes">2x</span>
|
|
480
|
+
<span class="cline-any cline-yes">2x</span>
|
|
481
|
+
<span class="cline-any cline-yes">2x</span>
|
|
482
|
+
<span class="cline-any cline-yes">1x</span>
|
|
483
|
+
<span class="cline-any cline-yes">10x</span>
|
|
484
|
+
<span class="cline-any cline-yes">10x</span>
|
|
485
|
+
<span class="cline-any cline-yes">10x</span>
|
|
486
|
+
<span class="cline-any cline-yes">10x</span>
|
|
487
|
+
<span class="cline-any cline-yes">10x</span>
|
|
488
|
+
<span class="cline-any cline-yes">10x</span>
|
|
489
|
+
<span class="cline-any cline-yes">10x</span>
|
|
490
|
+
<span class="cline-any cline-yes">10x</span>
|
|
491
|
+
<span class="cline-any cline-yes">10x</span>
|
|
492
|
+
<span class="cline-any cline-yes">10x</span>
|
|
493
|
+
<span class="cline-any cline-yes">10x</span>
|
|
494
|
+
<span class="cline-any cline-yes">10x</span>
|
|
495
|
+
<span class="cline-any cline-yes">10x</span>
|
|
496
|
+
<span class="cline-any cline-yes">10x</span>
|
|
497
|
+
<span class="cline-any cline-yes">10x</span>
|
|
498
|
+
<span class="cline-any cline-yes">10x</span>
|
|
499
|
+
<span class="cline-any cline-yes">10x</span>
|
|
500
|
+
<span class="cline-any cline-yes">10x</span>
|
|
501
|
+
<span class="cline-any cline-yes">1x</span>
|
|
502
|
+
<span class="cline-any cline-yes">1x</span>
|
|
503
|
+
<span class="cline-any cline-yes">55x</span>
|
|
504
|
+
<span class="cline-any cline-yes">55x</span>
|
|
505
|
+
<span class="cline-any cline-yes">54x</span>
|
|
506
|
+
<span class="cline-any cline-yes">1x</span>
|
|
507
|
+
<span class="cline-any cline-yes">1x</span>
|
|
508
|
+
<span class="cline-any cline-yes">1x</span>
|
|
509
|
+
<span class="cline-any cline-yes">54x</span>
|
|
510
|
+
<span class="cline-any cline-yes">55x</span>
|
|
511
|
+
<span class="cline-any cline-yes">1x</span>
|
|
512
|
+
<span class="cline-any cline-yes">1x</span>
|
|
513
|
+
<span class="cline-any cline-yes">55x</span>
|
|
514
|
+
<span class="cline-any cline-yes">55x</span>
|
|
515
|
+
<span class="cline-any cline-yes">54x</span>
|
|
516
|
+
<span class="cline-any cline-yes">54x</span>
|
|
517
|
+
<span class="cline-any cline-yes">54x</span>
|
|
518
|
+
<span class="cline-any cline-yes">54x</span>
|
|
519
|
+
<span class="cline-any cline-yes">1x</span>
|
|
520
|
+
<span class="cline-any cline-yes">1x</span>
|
|
521
|
+
<span class="cline-any cline-yes">1x</span>
|
|
522
|
+
<span class="cline-any cline-yes">1x</span>
|
|
523
|
+
<span class="cline-any cline-yes">1x</span>
|
|
524
|
+
<span class="cline-any cline-yes">1x</span>
|
|
525
|
+
<span class="cline-any cline-yes">1x</span>
|
|
526
|
+
<span class="cline-any cline-yes">1x</span>
|
|
527
|
+
<span class="cline-any cline-yes">1x</span>
|
|
528
|
+
<span class="cline-any cline-yes">1x</span>
|
|
529
|
+
<span class="cline-any cline-yes">1x</span>
|
|
530
|
+
<span class="cline-any cline-no"> </span>
|
|
531
|
+
<span class="cline-any cline-no"> </span>
|
|
532
|
+
<span class="cline-any cline-no"> </span>
|
|
533
|
+
<span class="cline-any cline-no"> </span>
|
|
534
|
+
<span class="cline-any cline-no"> </span>
|
|
535
|
+
<span class="cline-any cline-no"> </span>
|
|
536
|
+
<span class="cline-any cline-yes">1x</span>
|
|
537
|
+
<span class="cline-any cline-yes">1x</span>
|
|
538
|
+
<span class="cline-any cline-yes">1x</span>
|
|
539
|
+
<span class="cline-any cline-yes">1x</span>
|
|
540
|
+
<span class="cline-any cline-yes">1x</span>
|
|
541
|
+
<span class="cline-any cline-yes">1x</span>
|
|
542
|
+
<span class="cline-any cline-yes">1x</span>
|
|
543
|
+
<span class="cline-any cline-yes">1x</span>
|
|
544
|
+
<span class="cline-any cline-yes">1x</span>
|
|
545
|
+
<span class="cline-any cline-yes">1x</span>
|
|
546
|
+
<span class="cline-any cline-yes">1x</span>
|
|
547
|
+
<span class="cline-any cline-yes">1x</span>
|
|
548
|
+
<span class="cline-any cline-yes">1x</span>
|
|
549
|
+
<span class="cline-any cline-yes">1x</span>
|
|
550
|
+
<span class="cline-any cline-yes">1x</span>
|
|
551
|
+
<span class="cline-any cline-yes">1x</span>
|
|
552
|
+
<span class="cline-any cline-yes">1x</span>
|
|
553
|
+
<span class="cline-any cline-yes">1x</span>
|
|
554
|
+
<span class="cline-any cline-yes">1x</span>
|
|
555
|
+
<span class="cline-any cline-yes">54x</span>
|
|
556
|
+
<span class="cline-any cline-yes">54x</span>
|
|
557
|
+
<span class="cline-any cline-yes">6x</span>
|
|
558
|
+
<span class="cline-any cline-yes">6x</span>
|
|
559
|
+
<span class="cline-any cline-yes">6x</span>
|
|
560
|
+
<span class="cline-any cline-yes">6x</span>
|
|
561
|
+
<span class="cline-any cline-yes">6x</span>
|
|
562
|
+
<span class="cline-any cline-yes">6x</span>
|
|
563
|
+
<span class="cline-any cline-yes">6x</span>
|
|
564
|
+
<span class="cline-any cline-yes">6x</span>
|
|
565
|
+
<span class="cline-any cline-yes">6x</span>
|
|
566
|
+
<span class="cline-any cline-yes">6x</span>
|
|
567
|
+
<span class="cline-any cline-yes">6x</span>
|
|
568
|
+
<span class="cline-any cline-yes">6x</span>
|
|
569
|
+
<span class="cline-any cline-yes">6x</span>
|
|
570
|
+
<span class="cline-any cline-yes">6x</span>
|
|
571
|
+
<span class="cline-any cline-yes">2x</span>
|
|
572
|
+
<span class="cline-any cline-yes">2x</span>
|
|
573
|
+
<span class="cline-any cline-yes">2x</span>
|
|
574
|
+
<span class="cline-any cline-yes">6x</span>
|
|
575
|
+
<span class="cline-any cline-yes">4x</span>
|
|
576
|
+
<span class="cline-any cline-yes">4x</span>
|
|
577
|
+
<span class="cline-any cline-yes">4x</span>
|
|
578
|
+
<span class="cline-any cline-yes">4x</span>
|
|
579
|
+
<span class="cline-any cline-yes">4x</span>
|
|
580
|
+
<span class="cline-any cline-yes">6x</span>
|
|
581
|
+
<span class="cline-any cline-yes">54x</span>
|
|
582
|
+
<span class="cline-any cline-yes">54x</span>
|
|
583
|
+
<span class="cline-any cline-yes">3x</span>
|
|
584
|
+
<span class="cline-any cline-yes">3x</span>
|
|
585
|
+
<span class="cline-any cline-yes">3x</span>
|
|
586
|
+
<span class="cline-any cline-yes">3x</span>
|
|
587
|
+
<span class="cline-any cline-yes">3x</span>
|
|
588
|
+
<span class="cline-any cline-yes">3x</span>
|
|
589
|
+
<span class="cline-any cline-yes">3x</span>
|
|
590
|
+
<span class="cline-any cline-yes">3x</span>
|
|
591
|
+
<span class="cline-any cline-yes">3x</span>
|
|
592
|
+
<span class="cline-any cline-yes">3x</span>
|
|
593
|
+
<span class="cline-any cline-yes">3x</span>
|
|
594
|
+
<span class="cline-any cline-yes">3x</span>
|
|
595
|
+
<span class="cline-any cline-yes">3x</span>
|
|
596
|
+
<span class="cline-any cline-yes">3x</span>
|
|
597
|
+
<span class="cline-any cline-yes">3x</span>
|
|
598
|
+
<span class="cline-any cline-yes">54x</span>
|
|
599
|
+
<span class="cline-any cline-yes">55x</span>
|
|
600
|
+
<span class="cline-any cline-yes">55x</span>
|
|
601
|
+
<span class="cline-any cline-yes">55x</span>
|
|
602
|
+
<span class="cline-any cline-yes">1x</span>
|
|
603
|
+
<span class="cline-any cline-yes">1x</span>
|
|
604
|
+
<span class="cline-any cline-yes">3x</span>
|
|
605
|
+
<span class="cline-any cline-yes">38x</span>
|
|
606
|
+
<span class="cline-any cline-yes">38x</span>
|
|
607
|
+
<span class="cline-any cline-yes">38x</span>
|
|
608
|
+
<span class="cline-any cline-yes">38x</span>
|
|
609
|
+
<span class="cline-any cline-yes">38x</span>
|
|
610
|
+
<span class="cline-any cline-yes">38x</span>
|
|
611
|
+
<span class="cline-any cline-yes">38x</span>
|
|
612
|
+
<span class="cline-any cline-yes">38x</span>
|
|
613
|
+
<span class="cline-any cline-yes">38x</span>
|
|
614
|
+
<span class="cline-any cline-yes">38x</span>
|
|
615
|
+
<span class="cline-any cline-yes">38x</span>
|
|
616
|
+
<span class="cline-any cline-yes">38x</span>
|
|
617
|
+
<span class="cline-any cline-yes">37x</span>
|
|
618
|
+
<span class="cline-any cline-yes">38x</span>
|
|
619
|
+
<span class="cline-any cline-yes">38x</span>
|
|
620
|
+
<span class="cline-any cline-yes">38x</span>
|
|
621
|
+
<span class="cline-any cline-yes">38x</span>
|
|
622
|
+
<span class="cline-any cline-yes">38x</span>
|
|
623
|
+
<span class="cline-any cline-yes">37x</span>
|
|
624
|
+
<span class="cline-any cline-yes">37x</span>
|
|
625
|
+
<span class="cline-any cline-yes">620x</span>
|
|
626
|
+
<span class="cline-any cline-yes">620x</span>
|
|
627
|
+
<span class="cline-any cline-yes">616x</span>
|
|
628
|
+
<span class="cline-any cline-yes">620x</span>
|
|
629
|
+
<span class="cline-any cline-yes">613x</span>
|
|
630
|
+
<span class="cline-any cline-yes">620x</span>
|
|
631
|
+
<span class="cline-any cline-yes">620x</span>
|
|
632
|
+
<span class="cline-any cline-yes">2x</span>
|
|
633
|
+
<span class="cline-any cline-yes">2x</span>
|
|
634
|
+
<span class="cline-any cline-yes">37x</span>
|
|
635
|
+
<span class="cline-any cline-yes">37x</span>
|
|
636
|
+
<span class="cline-any cline-yes">619x</span>
|
|
637
|
+
<span class="cline-any cline-yes">619x</span>
|
|
638
|
+
<span class="cline-any cline-yes">619x</span>
|
|
639
|
+
<span class="cline-any cline-yes">4x</span>
|
|
640
|
+
<span class="cline-any cline-yes">4x</span>
|
|
641
|
+
<span class="cline-any cline-no"> </span>
|
|
642
|
+
<span class="cline-any cline-no"> </span>
|
|
643
|
+
<span class="cline-any cline-yes">4x</span>
|
|
644
|
+
<span class="cline-any cline-yes">619x</span>
|
|
645
|
+
<span class="cline-any cline-yes">2x</span>
|
|
646
|
+
<span class="cline-any cline-yes">2x</span>
|
|
647
|
+
<span class="cline-any cline-yes">619x</span>
|
|
648
|
+
<span class="cline-any cline-yes">3x</span>
|
|
649
|
+
<span class="cline-any cline-yes">3x</span>
|
|
650
|
+
<span class="cline-any cline-yes">619x</span>
|
|
651
|
+
<span class="cline-any cline-yes">619x</span>
|
|
652
|
+
<span class="cline-any cline-yes">619x</span>
|
|
653
|
+
<span class="cline-any cline-yes">611x</span>
|
|
654
|
+
<span class="cline-any cline-yes">611x</span>
|
|
655
|
+
<span class="cline-any cline-yes">611x</span>
|
|
656
|
+
<span class="cline-any cline-yes">611x</span>
|
|
657
|
+
<span class="cline-any cline-yes">611x</span>
|
|
658
|
+
<span class="cline-any cline-yes">619x</span>
|
|
659
|
+
<span class="cline-any cline-yes">3x</span>
|
|
660
|
+
<span class="cline-any cline-yes">3x</span>
|
|
661
|
+
<span class="cline-any cline-yes">3x</span>
|
|
662
|
+
<span class="cline-any cline-yes">3x</span>
|
|
663
|
+
<span class="cline-any cline-yes">3x</span>
|
|
664
|
+
<span class="cline-any cline-yes">8x</span>
|
|
665
|
+
<span class="cline-any cline-yes">5x</span>
|
|
666
|
+
<span class="cline-any cline-yes">5x</span>
|
|
667
|
+
<span class="cline-any cline-yes">5x</span>
|
|
668
|
+
<span class="cline-any cline-yes">5x</span>
|
|
669
|
+
<span class="cline-any cline-yes">5x</span>
|
|
670
|
+
<span class="cline-any cline-yes">5x</span>
|
|
671
|
+
<span class="cline-any cline-yes">5x</span>
|
|
672
|
+
<span class="cline-any cline-yes">37x</span>
|
|
673
|
+
<span class="cline-any cline-yes">37x</span>
|
|
674
|
+
<span class="cline-any cline-yes">38x</span>
|
|
675
|
+
<span class="cline-any cline-yes">2x</span>
|
|
676
|
+
<span class="cline-any cline-yes">5x</span>
|
|
677
|
+
<span class="cline-any cline-yes">5x</span>
|
|
678
|
+
<span class="cline-any cline-yes">5x</span>
|
|
679
|
+
<span class="cline-any cline-yes">20x</span>
|
|
680
|
+
<span class="cline-any cline-yes">10x</span>
|
|
681
|
+
<span class="cline-any cline-yes">10x</span>
|
|
682
|
+
<span class="cline-any cline-yes">5x</span>
|
|
683
|
+
<span class="cline-any cline-yes">5x</span>
|
|
684
|
+
<span class="cline-any cline-no"> </span>
|
|
685
|
+
<span class="cline-any cline-no"> </span>
|
|
686
|
+
<span class="cline-any cline-no"> </span>
|
|
687
|
+
<span class="cline-any cline-no"> </span>
|
|
688
|
+
<span class="cline-any cline-no"> </span>
|
|
689
|
+
<span class="cline-any cline-yes">2x</span>
|
|
690
|
+
<span class="cline-any cline-yes">2x</span>
|
|
691
|
+
<span class="cline-any cline-yes">37x</span>
|
|
692
|
+
<span class="cline-any cline-yes">38x</span>
|
|
693
|
+
<span class="cline-any cline-yes">36x</span>
|
|
694
|
+
<span class="cline-any cline-yes">36x</span>
|
|
695
|
+
<span class="cline-any cline-yes">36x</span>
|
|
696
|
+
<span class="cline-any cline-yes">36x</span>
|
|
697
|
+
<span class="cline-any cline-yes">36x</span>
|
|
698
|
+
<span class="cline-any cline-yes">38x</span>
|
|
699
|
+
<span class="cline-any cline-no"> </span>
|
|
700
|
+
<span class="cline-any cline-no"> </span>
|
|
701
|
+
<span class="cline-any cline-no"> </span>
|
|
702
|
+
<span class="cline-any cline-no"> </span>
|
|
703
|
+
<span class="cline-any cline-yes">1x</span>
|
|
704
|
+
<span class="cline-any cline-yes">1x</span>
|
|
705
|
+
<span class="cline-any cline-yes">1x</span>
|
|
706
|
+
<span class="cline-any cline-yes">38x</span>
|
|
707
|
+
<span class="cline-any cline-yes">3x</span>
|
|
708
|
+
<span class="cline-any cline-yes">1x</span>
|
|
709
|
+
<span class="cline-any cline-yes">1x</span>
|
|
710
|
+
<span class="cline-any cline-yes">36x</span>
|
|
711
|
+
<span class="cline-any cline-yes">36x</span>
|
|
712
|
+
<span class="cline-any cline-yes">36x</span>
|
|
713
|
+
<span class="cline-any cline-yes">36x</span>
|
|
714
|
+
<span class="cline-any cline-yes">36x</span>
|
|
715
|
+
<span class="cline-any cline-yes">8x</span>
|
|
716
|
+
<span class="cline-any cline-yes">8x</span>
|
|
717
|
+
<span class="cline-any cline-yes">8x</span>
|
|
718
|
+
<span class="cline-any cline-yes">8x</span>
|
|
719
|
+
<span class="cline-any cline-yes">8x</span>
|
|
720
|
+
<span class="cline-any cline-yes">8x</span>
|
|
721
|
+
<span class="cline-any cline-yes">8x</span>
|
|
722
|
+
<span class="cline-any cline-yes">8x</span>
|
|
723
|
+
<span class="cline-any cline-yes">8x</span>
|
|
724
|
+
<span class="cline-any cline-yes">8x</span>
|
|
725
|
+
<span class="cline-any cline-yes">8x</span>
|
|
726
|
+
<span class="cline-any cline-yes">8x</span>
|
|
727
|
+
<span class="cline-any cline-yes">8x</span>
|
|
728
|
+
<span class="cline-any cline-yes">8x</span>
|
|
729
|
+
<span class="cline-any cline-yes">8x</span>
|
|
730
|
+
<span class="cline-any cline-yes">8x</span>
|
|
731
|
+
<span class="cline-any cline-yes">3x</span>
|
|
732
|
+
<span class="cline-any cline-yes">3x</span>
|
|
733
|
+
<span class="cline-any cline-yes">3x</span>
|
|
734
|
+
<span class="cline-any cline-yes">3x</span>
|
|
735
|
+
<span class="cline-any cline-yes">3x</span>
|
|
736
|
+
<span class="cline-any cline-yes">3x</span>
|
|
737
|
+
<span class="cline-any cline-yes">3x</span>
|
|
738
|
+
<span class="cline-any cline-yes">8x</span>
|
|
739
|
+
<span class="cline-any cline-yes">5x</span>
|
|
740
|
+
<span class="cline-any cline-yes">5x</span>
|
|
741
|
+
<span class="cline-any cline-yes">5x</span>
|
|
742
|
+
<span class="cline-any cline-yes">5x</span>
|
|
743
|
+
<span class="cline-any cline-yes">5x</span>
|
|
744
|
+
<span class="cline-any cline-yes">5x</span>
|
|
745
|
+
<span class="cline-any cline-yes">5x</span>
|
|
746
|
+
<span class="cline-any cline-yes">5x</span>
|
|
747
|
+
<span class="cline-any cline-yes">5x</span>
|
|
748
|
+
<span class="cline-any cline-yes">5x</span>
|
|
749
|
+
<span class="cline-any cline-yes">5x</span>
|
|
750
|
+
<span class="cline-any cline-yes">5x</span>
|
|
751
|
+
<span class="cline-any cline-yes">5x</span>
|
|
752
|
+
<span class="cline-any cline-yes">5x</span>
|
|
753
|
+
<span class="cline-any cline-yes">3x</span>
|
|
754
|
+
<span class="cline-any cline-yes">3x</span>
|
|
755
|
+
<span class="cline-any cline-yes">3x</span>
|
|
756
|
+
<span class="cline-any cline-yes">3x</span>
|
|
757
|
+
<span class="cline-any cline-yes">5x</span>
|
|
758
|
+
<span class="cline-any cline-yes">8x</span>
|
|
759
|
+
<span class="cline-any cline-yes">8x</span>
|
|
760
|
+
<span class="cline-any cline-yes">8x</span>
|
|
761
|
+
<span class="cline-any cline-yes">8x</span>
|
|
762
|
+
<span class="cline-any cline-yes">8x</span>
|
|
763
|
+
<span class="cline-any cline-yes">8x</span>
|
|
764
|
+
<span class="cline-any cline-yes">8x</span>
|
|
765
|
+
<span class="cline-any cline-yes">8x</span>
|
|
766
|
+
<span class="cline-any cline-yes">8x</span>
|
|
767
|
+
<span class="cline-any cline-yes">8x</span>
|
|
768
|
+
<span class="cline-any cline-yes">7x</span>
|
|
769
|
+
<span class="cline-any cline-yes">7x</span>
|
|
770
|
+
<span class="cline-any cline-yes">8x</span>
|
|
771
|
+
<span class="cline-any cline-yes">8x</span>
|
|
772
|
+
<span class="cline-any cline-yes">8x</span>
|
|
773
|
+
<span class="cline-any cline-yes">8x</span>
|
|
774
|
+
<span class="cline-any cline-yes">8x</span>
|
|
775
|
+
<span class="cline-any cline-yes">8x</span>
|
|
776
|
+
<span class="cline-any cline-yes">8x</span>
|
|
777
|
+
<span class="cline-any cline-yes">8x</span>
|
|
778
|
+
<span class="cline-any cline-yes">8x</span>
|
|
779
|
+
<span class="cline-any cline-yes">8x</span>
|
|
780
|
+
<span class="cline-any cline-yes">11x</span>
|
|
781
|
+
<span class="cline-any cline-yes">11x</span>
|
|
782
|
+
<span class="cline-any cline-yes">11x</span>
|
|
783
|
+
<span class="cline-any cline-yes">11x</span>
|
|
784
|
+
<span class="cline-any cline-yes">11x</span>
|
|
785
|
+
<span class="cline-any cline-yes">11x</span>
|
|
786
|
+
<span class="cline-any cline-no"> </span>
|
|
787
|
+
<span class="cline-any cline-no"> </span>
|
|
788
|
+
<span class="cline-any cline-yes">11x</span>
|
|
789
|
+
<span class="cline-any cline-yes">11x</span>
|
|
790
|
+
<span class="cline-any cline-yes">11x</span>
|
|
791
|
+
<span class="cline-any cline-yes">11x</span>
|
|
792
|
+
<span class="cline-any cline-yes">11x</span>
|
|
793
|
+
<span class="cline-any cline-yes">11x</span>
|
|
794
|
+
<span class="cline-any cline-yes">11x</span>
|
|
795
|
+
<span class="cline-any cline-yes">4x</span>
|
|
796
|
+
<span class="cline-any cline-yes">4x</span>
|
|
797
|
+
<span class="cline-any cline-yes">4x</span>
|
|
798
|
+
<span class="cline-any cline-yes">4x</span>
|
|
799
|
+
<span class="cline-any cline-yes">1x</span>
|
|
800
|
+
<span class="cline-any cline-yes">1x</span>
|
|
801
|
+
<span class="cline-any cline-yes">1x</span>
|
|
802
|
+
<span class="cline-any cline-yes">1x</span>
|
|
803
|
+
<span class="cline-any cline-yes">4x</span>
|
|
804
|
+
<span class="cline-any cline-yes">11x</span>
|
|
805
|
+
<span class="cline-any cline-yes">7x</span>
|
|
806
|
+
<span class="cline-any cline-yes">7x</span>
|
|
807
|
+
<span class="cline-any cline-yes">11x</span>
|
|
808
|
+
<span class="cline-any cline-yes">11x</span>
|
|
809
|
+
<span class="cline-any cline-yes">38x</span>
|
|
810
|
+
<span class="cline-any cline-yes">11x</span>
|
|
811
|
+
<span class="cline-any cline-yes">11x</span>
|
|
812
|
+
<span class="cline-any cline-yes">11x</span>
|
|
813
|
+
<span class="cline-any cline-yes">11x</span>
|
|
814
|
+
<span class="cline-any cline-yes">11x</span>
|
|
815
|
+
<span class="cline-any cline-yes">11x</span>
|
|
816
|
+
<span class="cline-any cline-yes">11x</span>
|
|
817
|
+
<span class="cline-any cline-yes">13x</span>
|
|
818
|
+
<span class="cline-any cline-yes">13x</span>
|
|
819
|
+
<span class="cline-any cline-yes">13x</span>
|
|
820
|
+
<span class="cline-any cline-yes">6x</span>
|
|
821
|
+
<span class="cline-any cline-yes">6x</span>
|
|
822
|
+
<span class="cline-any cline-yes">6x</span>
|
|
823
|
+
<span class="cline-any cline-yes">6x</span>
|
|
824
|
+
<span class="cline-any cline-yes">6x</span>
|
|
825
|
+
<span class="cline-any cline-yes">6x</span>
|
|
826
|
+
<span class="cline-any cline-yes">11x</span>
|
|
827
|
+
<span class="cline-any cline-yes">11x</span>
|
|
828
|
+
<span class="cline-any cline-yes">11x</span>
|
|
829
|
+
<span class="cline-any cline-yes">8x</span>
|
|
830
|
+
<span class="cline-any cline-yes">8x</span>
|
|
831
|
+
<span class="cline-any cline-yes">9x</span>
|
|
832
|
+
<span class="cline-any cline-yes">9x</span>
|
|
833
|
+
<span class="cline-any cline-yes">9x</span>
|
|
834
|
+
<span class="cline-any cline-yes">9x</span>
|
|
835
|
+
<span class="cline-any cline-yes">8x</span>
|
|
836
|
+
<span class="cline-any cline-yes">11x</span>
|
|
837
|
+
<span class="cline-any cline-yes">3x</span>
|
|
838
|
+
<span class="cline-any cline-yes">4x</span>
|
|
839
|
+
<span class="cline-any cline-yes">4x</span>
|
|
840
|
+
<span class="cline-any cline-yes">4x</span>
|
|
841
|
+
<span class="cline-any cline-yes">4x</span>
|
|
842
|
+
<span class="cline-any cline-yes">4x</span>
|
|
843
|
+
<span class="cline-any cline-yes">4x</span>
|
|
844
|
+
<span class="cline-any cline-yes">4x</span>
|
|
845
|
+
<span class="cline-any cline-yes">4x</span>
|
|
846
|
+
<span class="cline-any cline-yes">4x</span>
|
|
847
|
+
<span class="cline-any cline-yes">4x</span>
|
|
848
|
+
<span class="cline-any cline-yes">4x</span>
|
|
849
|
+
<span class="cline-any cline-yes">4x</span>
|
|
850
|
+
<span class="cline-any cline-yes">4x</span>
|
|
851
|
+
<span class="cline-any cline-yes">4x</span>
|
|
852
|
+
<span class="cline-any cline-yes">3x</span>
|
|
853
|
+
<span class="cline-any cline-no"> </span>
|
|
854
|
+
<span class="cline-any cline-yes">3x</span>
|
|
855
|
+
<span class="cline-any cline-yes">4x</span>
|
|
856
|
+
<span class="cline-any cline-yes">4x</span>
|
|
857
|
+
<span class="cline-any cline-no"> </span>
|
|
858
|
+
<span class="cline-any cline-no"> </span>
|
|
859
|
+
<span class="cline-any cline-no"> </span>
|
|
860
|
+
<span class="cline-any cline-yes">3x</span>
|
|
861
|
+
<span class="cline-any cline-yes">3x</span>
|
|
862
|
+
<span class="cline-any cline-yes">8x</span>
|
|
863
|
+
<span class="cline-any cline-yes">8x</span>
|
|
864
|
+
<span class="cline-any cline-yes">8x</span>
|
|
865
|
+
<span class="cline-any cline-yes">8x</span>
|
|
866
|
+
<span class="cline-any cline-yes">8x</span>
|
|
867
|
+
<span class="cline-any cline-yes">8x</span>
|
|
868
|
+
<span class="cline-any cline-yes">8x</span>
|
|
869
|
+
<span class="cline-any cline-yes">8x</span>
|
|
870
|
+
<span class="cline-any cline-yes">36x</span>
|
|
871
|
+
<span class="cline-any cline-yes">36x</span>
|
|
872
|
+
<span class="cline-any cline-neutral"> </span></td><td class="text"><pre class="prettyprint lang-js">import _ from 'lodash'
|
|
873
|
+
import { marshallGeometry } from '../marshall.js'
|
|
874
|
+
import makeDebug from 'debug'
|
|
875
|
+
|
|
876
|
+
const debug = makeDebug('kdk:map:query:hooks')
|
|
877
|
+
|
|
878
|
+
export function marshallGeometryQuery (hook) {
|
|
879
|
+
const query = hook.params.query
|
|
880
|
+
if (_.isNil(query)) <span class="branch-0 cbranch-no" title="branch not covered" >return</span>
|
|
881
|
+
const geometry = query.geometry
|
|
882
|
+
if (_.isNil(geometry)) <span class="branch-0 cbranch-no" title="branch not covered" >return</span>
|
|
883
|
+
marshallGeometry(geometry)
|
|
884
|
+
}
|
|
885
|
+
|
|
886
|
+
function getGeometryQueryForBBox (bbox) {
|
|
887
|
+
// Here we use the custom MongoDB CRS that enforces counter-clockwise winding order
|
|
888
|
+
// and allows to support queries with a single-ringed GeoJSON polygon
|
|
889
|
+
// whose area is greater than or equal to a single hemisphere.
|
|
890
|
+
// Otherwise $geoIntersects queries for the complementary geometry.
|
|
891
|
+
return {
|
|
892
|
+
$geoIntersects: {
|
|
893
|
+
$geometry: {
|
|
894
|
+
type: 'Polygon',
|
|
895
|
+
coordinates: [bbox],
|
|
896
|
+
crs: {
|
|
897
|
+
type: 'name',
|
|
898
|
+
properties: { name: 'urn:x-mongodb:crs:strictwinding:EPSG:4326' }
|
|
899
|
+
}
|
|
900
|
+
}
|
|
901
|
+
}
|
|
902
|
+
}
|
|
903
|
+
}
|
|
904
|
+
|
|
905
|
+
export function marshallGeoJsonQuery (hook) {
|
|
906
|
+
const query = hook.params.query
|
|
907
|
+
if (query) {
|
|
908
|
+
if (query.geoJson) {
|
|
909
|
+
delete query.geoJson
|
|
910
|
+
hook.params.asGeoJson = true
|
|
911
|
+
}
|
|
912
|
+
}
|
|
913
|
+
}
|
|
914
|
+
|
|
915
|
+
export function marshallSpatialQuery (hook) {
|
|
916
|
+
const query = hook.params.query
|
|
917
|
+
if (query) {
|
|
918
|
+
if (!_.isNil(query.geometry)) marshallGeometry(query.geometry)
|
|
919
|
+
// Shortcut for proximity query
|
|
920
|
+
if ((!_.isNil(query.centerLon) || !_.isNil(query.longitude)) &&
|
|
921
|
+
(!_.isNil(query.centerLat) || !_.isNil(query.latitude)) && !_.isNil(query.distance)) {
|
|
922
|
+
const longitude = (_.isNil(query.centerLon) ? _.toNumber(query.longitude) <span class="branch-0 cbranch-no" title="branch not covered" >: _.toNumber(query.centerLon))</span>
|
|
923
|
+
const latitude = (_.isNil(query.centerLat) ? _.toNumber(query.latitude) <span class="branch-0 cbranch-no" title="branch not covered" >: _.toNumber(query.centerLat))</span>
|
|
924
|
+
const distance = _.toNumber(query.distance)
|
|
925
|
+
// Transform to MongoDB spatial request
|
|
926
|
+
delete query.centerLon
|
|
927
|
+
delete query.longitude
|
|
928
|
+
delete query.centerLat
|
|
929
|
+
delete query.latitude
|
|
930
|
+
delete query.distance
|
|
931
|
+
// Aggregation requires a specific operator
|
|
932
|
+
if (query.$aggregate) <span class="branch-0 cbranch-no" title="branch not covered" >{</span>
|
|
927
933
|
<span class="cstat-no" title="statement not covered" > query.$geoNear = {</span>
|
|
928
934
|
<span class="cstat-no" title="statement not covered" > near: { type: 'Point', coordinates: [longitude, latitude] },</span>
|
|
929
935
|
<span class="cstat-no" title="statement not covered" > maxDistance: distance,</span>
|
|
930
936
|
<span class="cstat-no" title="statement not covered" > distanceField: 'distance',</span>
|
|
931
937
|
<span class="cstat-no" title="statement not covered" > spherical: true</span>
|
|
932
938
|
<span class="cstat-no" title="statement not covered" > }</span>
|
|
933
|
-
|
|
934
|
-
|
|
935
|
-
|
|
936
|
-
|
|
937
|
-
|
|
938
|
-
|
|
939
|
-
|
|
940
|
-
|
|
941
|
-
|
|
942
|
-
|
|
943
|
-
|
|
944
|
-
|
|
945
|
-
|
|
946
|
-
|
|
947
|
-
|
|
948
|
-
|
|
949
|
-
|
|
950
|
-
|
|
951
|
-
|
|
952
|
-
|
|
953
|
-
|
|
954
|
-
|
|
955
|
-
|
|
956
|
-
|
|
957
|
-
|
|
958
|
-
|
|
959
|
-
|
|
960
|
-
|
|
961
|
-
|
|
962
|
-
|
|
963
|
-
|
|
964
|
-
|
|
965
|
-
|
|
966
|
-
|
|
967
|
-
|
|
968
|
-
|
|
969
|
-
|
|
970
|
-
|
|
971
|
-
|
|
972
|
-
|
|
973
|
-
|
|
974
|
-
|
|
975
|
-
|
|
976
|
-
|
|
977
|
-
|
|
978
|
-
|
|
979
|
-
|
|
980
|
-
|
|
981
|
-
|
|
982
|
-
|
|
983
|
-
|
|
984
|
-
|
|
985
|
-
|
|
986
|
-
|
|
987
|
-
|
|
988
|
-
|
|
989
|
-
|
|
990
|
-
|
|
991
|
-
|
|
992
|
-
|
|
993
|
-
|
|
994
|
-
|
|
995
|
-
|
|
996
|
-
|
|
997
|
-
|
|
998
|
-
|
|
999
|
-
|
|
1000
|
-
|
|
1001
|
-
|
|
1002
|
-
|
|
1003
|
-
|
|
1004
|
-
|
|
1005
|
-
|
|
1006
|
-
|
|
1007
|
-
|
|
1008
|
-
|
|
1009
|
-
|
|
1010
|
-
|
|
1011
|
-
|
|
1012
|
-
|
|
1013
|
-
<span class="
|
|
1014
|
-
|
|
1015
|
-
|
|
1016
|
-
|
|
1017
|
-
|
|
1018
|
-
|
|
1019
|
-
<span class="
|
|
1020
|
-
|
|
1021
|
-
|
|
1022
|
-
|
|
1023
|
-
|
|
1024
|
-
|
|
1025
|
-
|
|
1026
|
-
|
|
1027
|
-
|
|
1028
|
-
|
|
1029
|
-
|
|
1030
|
-
|
|
1031
|
-
|
|
1032
|
-
|
|
1033
|
-
|
|
1034
|
-
|
|
1035
|
-
|
|
1036
|
-
|
|
1037
|
-
<span class="
|
|
939
|
+
} else {
|
|
940
|
+
/* We switched from $near to $geoWithin due to https://github.com/kalisio/kdk/issues/345
|
|
941
|
+
query.geometry = {
|
|
942
|
+
$near: {
|
|
943
|
+
$geometry: {
|
|
944
|
+
type: 'Point',
|
|
945
|
+
coordinates: [longitude, latitude]
|
|
946
|
+
},
|
|
947
|
+
$maxDistance: distance
|
|
948
|
+
}
|
|
949
|
+
}
|
|
950
|
+
*/
|
|
951
|
+
query.geometry = {
|
|
952
|
+
$geoWithin: {
|
|
953
|
+
$centerSphere: [[longitude, latitude], distance / 6378137.0] // Earth radius as in radians
|
|
954
|
+
}
|
|
955
|
+
}
|
|
956
|
+
}
|
|
957
|
+
}
|
|
958
|
+
// Shortcut for bbox query
|
|
959
|
+
if (!_.isNil(query.south) && !_.isNil(query.north) && !_.isNil(query.west) && !_.isNil(query.east)) {
|
|
960
|
+
const south = _.toNumber(query.south)
|
|
961
|
+
const north = _.toNumber(query.north)
|
|
962
|
+
const west = _.toNumber(query.west)
|
|
963
|
+
const east = _.toNumber(query.east)
|
|
964
|
+
// Transform to MongoDB spatial request
|
|
965
|
+
delete query.south
|
|
966
|
+
delete query.north
|
|
967
|
+
delete query.west
|
|
968
|
+
delete query.east
|
|
969
|
+
|
|
970
|
+
// FIXME: MongoDB should allow to support queries with a single-ringed GeoJSON polygon
|
|
971
|
+
// whose area is greater than or equal to a single hemisphere.
|
|
972
|
+
// However, we did not succeeed in making it work as expected, for now on we split large polygon into two halfs.
|
|
973
|
+
if ((east-west) <= 180) {
|
|
974
|
+
// BBox as a polygon also requires the closing point.
|
|
975
|
+
const bbox = [[west, south], [east, south], [east, north], [west, north], [west, south]]
|
|
976
|
+
query.geometry = getGeometryQueryForBBox(bbox)
|
|
977
|
+
} else {
|
|
978
|
+
// BBox as a polygon also requires the closing point.
|
|
979
|
+
const leftHalfBbox = [[west, south], [0.5*(west+east), south], [0.5*(west+east), north], [west, north], [west, south]]
|
|
980
|
+
const rightHalfBbox = [[0.5*(west+east), south], [east, south], [east, north], [0.5*(west+east), north], [0.5*(west+east), south]]
|
|
981
|
+
query.$or = [{ geometry: getGeometryQueryForBBox(leftHalfBbox) }, { geometry: getGeometryQueryForBBox(rightHalfBbox) }]
|
|
982
|
+
}
|
|
983
|
+
}
|
|
984
|
+
// Shortcut for location query
|
|
985
|
+
if (!_.isNil(query.longitude) && !_.isNil(query.latitude)) {
|
|
986
|
+
const longitude = _.toNumber(query.longitude)
|
|
987
|
+
const latitude = _.toNumber(query.latitude)
|
|
988
|
+
// Transform to MongoDB spatial request
|
|
989
|
+
delete query.longitude
|
|
990
|
+
delete query.latitude
|
|
991
|
+
const geometryQuery = {
|
|
992
|
+
$geoIntersects: {
|
|
993
|
+
$geometry: {
|
|
994
|
+
type: 'Point',
|
|
995
|
+
coordinates: [longitude, latitude]
|
|
996
|
+
}
|
|
997
|
+
}
|
|
998
|
+
}
|
|
999
|
+
query.geometry = geometryQuery
|
|
1000
|
+
}
|
|
1001
|
+
}
|
|
1002
|
+
// Include GeoJson query by default
|
|
1003
|
+
marshallGeoJsonQuery(hook)
|
|
1004
|
+
}
|
|
1005
|
+
|
|
1006
|
+
export function asGeoJson (options = {}) {
|
|
1007
|
+
return function (hook) {
|
|
1008
|
+
const params = hook.params
|
|
1009
|
+
const query = params.query
|
|
1010
|
+
if (!options.force && !params.asGeoJson) <span class="branch-0 cbranch-no" title="branch not covered" >return</span>
|
|
1011
|
+
if (_.has(query, '$distinct') || _.has(query, '$aggregation')) return // Not applicable in this case
|
|
1012
|
+
const longitudeProperty = (options.longitudeProperty || 'longitude')
|
|
1013
|
+
const latitudeProperty = (options.latitudeProperty || 'latitude')
|
|
1014
|
+
const altitudeProperty = (options.altitudeProperty || 'altitude')
|
|
1015
|
+
const geometryProperty = (options.geometryProperty || 'geometry')
|
|
1016
|
+
const allowNullGeometries = _.get(options, 'allowNullGeometries', false)
|
|
1017
|
+
let results = _.get(hook, options.dataPath || 'result')
|
|
1018
|
+
// Already as GeoJson ?
|
|
1019
|
+
if (results.type === 'FeatureCollection') <span class="branch-0 cbranch-no" title="branch not covered" >return</span>
|
|
1020
|
+
const isPaginated = !_.isNil(results.data)
|
|
1021
|
+
const pagination = (isPaginated ? _.pick(results, ['total', 'skip', 'limit']) : {})
|
|
1022
|
+
results = (isPaginated ? results.data : results)
|
|
1023
|
+
// Single item case, i.e. GET ?
|
|
1024
|
+
const isFeatureCollection = Array.isArray(results)
|
|
1025
|
+
if (!isFeatureCollection) <span class="branch-0 cbranch-no" title="branch not covered" >results = [results]</span>
|
|
1026
|
+
results = results
|
|
1027
|
+
.filter(item => {
|
|
1028
|
+
// Check if item is not already in GeoJson feature format and we can convert if required
|
|
1029
|
+
return (_.has(item, longitudeProperty) && _.has(item, latitudeProperty)) ||
|
|
1030
|
+
// When performing feature aggregation on geometries the result can be an array
|
|
1031
|
+
Array.isArray(_.get(item, geometryProperty)) ||
|
|
1032
|
+
// Check for a geometry property (previously provided or already transformed item)
|
|
1033
|
+
(_.has(item, geometryProperty + '.type') && _.has(item, geometryProperty + '.coordinates')) ||
|
|
1034
|
+
(_.has(item, geometryProperty + '.geometry.type') <span class="branch-0 cbranch-no" title="branch not covered" >&& _.has(item, geometryProperty + '.geometry.coordinates'))</span> ||
|
|
1035
|
+
// Check for null geometries when allowed
|
|
1036
|
+
allowNullGeometries
|
|
1037
|
+
})
|
|
1038
|
+
.map(item => {
|
|
1039
|
+
let coordinates
|
|
1040
|
+
// Keep track of coordinates before picking properties
|
|
1041
|
+
if (_.has(item, longitudeProperty) && _.has(item, latitudeProperty)) {
|
|
1042
|
+
coordinates = [_.get(item, longitudeProperty), _.get(item, latitudeProperty)]
|
|
1043
|
+
if (_.has(item, altitudeProperty)) <span class="branch-0 cbranch-no" title="branch not covered" >{</span>
|
|
1038
1044
|
<span class="cstat-no" title="statement not covered" > coordinates.push(_.get(item, altitudeProperty))</span>
|
|
1039
1045
|
<span class="cstat-no" title="statement not covered" > }</span>
|
|
1040
|
-
|
|
1041
|
-
|
|
1042
|
-
|
|
1043
|
-
|
|
1044
|
-
|
|
1045
|
-
|
|
1046
|
-
|
|
1047
|
-
|
|
1048
|
-
|
|
1049
|
-
|
|
1050
|
-
|
|
1051
|
-
|
|
1052
|
-
|
|
1053
|
-
|
|
1054
|
-
|
|
1055
|
-
|
|
1056
|
-
|
|
1057
|
-
|
|
1058
|
-
|
|
1059
|
-
|
|
1060
|
-
|
|
1061
|
-
|
|
1062
|
-
|
|
1063
|
-
|
|
1064
|
-
|
|
1065
|
-
|
|
1066
|
-
|
|
1067
|
-
|
|
1068
|
-
|
|
1069
|
-
|
|
1070
|
-
|
|
1071
|
-
|
|
1072
|
-
|
|
1073
|
-
|
|
1074
|
-
|
|
1075
|
-
|
|
1076
|
-
|
|
1077
|
-
|
|
1078
|
-
|
|
1079
|
-
|
|
1080
|
-
<span class="
|
|
1046
|
+
}
|
|
1047
|
+
if (options.pick) {
|
|
1048
|
+
item = _.pick(item, options.pick)
|
|
1049
|
+
}
|
|
1050
|
+
if (options.omit) {
|
|
1051
|
+
item = _.omit(item, options.omit)
|
|
1052
|
+
}
|
|
1053
|
+
// Item locations are already in GeoJson format
|
|
1054
|
+
if ((_.has(item, geometryProperty + '.type') && _.has(item, geometryProperty + '.coordinates')) ||
|
|
1055
|
+
(_.has(item, geometryProperty + '.geometry.type') <span class="branch-0 cbranch-no" title="branch not covered" >&& _.has(item, geometryProperty + '.geometry.coordinates'))</span>) {
|
|
1056
|
+
return Object.assign({
|
|
1057
|
+
type: 'Feature',
|
|
1058
|
+
geometry: _.get(item, geometryProperty + '.geometry', _.get(item, geometryProperty)),
|
|
1059
|
+
properties: {}
|
|
1060
|
+
}, _.omit(item, [geometryProperty]))
|
|
1061
|
+
} else if (Array.isArray(_.get(item, geometryProperty))) {
|
|
1062
|
+
return Object.assign({
|
|
1063
|
+
type: 'Feature',
|
|
1064
|
+
geometry: { type: 'GeometryCollection', geometries: _.get(item, geometryProperty) },
|
|
1065
|
+
properties: {}
|
|
1066
|
+
}, _.omit(item, [geometryProperty]))
|
|
1067
|
+
} else {
|
|
1068
|
+
// Item locations are not already in GeoJson feature format so we need to convert
|
|
1069
|
+
return Object.assign({
|
|
1070
|
+
type: 'Feature',
|
|
1071
|
+
geometry: (coordinates ? { type: 'Point', coordinates } : null),
|
|
1072
|
+
properties: {}
|
|
1073
|
+
}, _.omit(item, [longitudeProperty, latitudeProperty]))
|
|
1074
|
+
}
|
|
1075
|
+
})
|
|
1076
|
+
// Move some data to properties ?
|
|
1077
|
+
if (options.properties) {
|
|
1078
|
+
results.forEach(item => {
|
|
1079
|
+
// True indicates to move all fields to properties
|
|
1080
|
+
if (options.properties === true) {
|
|
1081
|
+
_.forOwn(item, (value, key) => {
|
|
1082
|
+
if ((key === 'geometry') || (key === 'type') || (key === '_id')) return
|
|
1083
|
+
_.set(item, `properties.${key}`, _.get(item, key))
|
|
1084
|
+
_.unset(item, key)
|
|
1085
|
+
})
|
|
1086
|
+
}<span class="branch-0 cbranch-no" title="branch not covered" > else { // Else we expect a specific mapping</span>
|
|
1081
1087
|
<span class="cstat-no" title="statement not covered" > options.properties.forEach(mapping => {</span>
|
|
1082
1088
|
<span class="cstat-no" title="statement not covered" > if (mapping.from) _.set(item, `properties.${mapping.to || mapping.from}`, _.get(item, `${mapping.from}`))</span>
|
|
1083
1089
|
<span class="cstat-no" title="statement not covered" > if (mapping.delete) _.unset(item, `${mapping.from}`)</span>
|
|
1084
1090
|
<span class="cstat-no" title="statement not covered" > })</span>
|
|
1085
1091
|
<span class="cstat-no" title="statement not covered" > }</span>
|
|
1086
|
-
|
|
1087
|
-
|
|
1088
|
-
|
|
1089
|
-
|
|
1090
|
-
|
|
1091
|
-
|
|
1092
|
-
|
|
1093
|
-
|
|
1094
|
-
|
|
1095
|
-
<span class="
|
|
1092
|
+
})
|
|
1093
|
+
}
|
|
1094
|
+
// If we should make it available as a GeoJson feature collection create it
|
|
1095
|
+
if (isFeatureCollection && _.get(options, 'asFeatureCollection', true)) {
|
|
1096
|
+
// Copy pagination information if any so that client can use it anyway
|
|
1097
|
+
_.set(hook, options.dataPath || 'result', Object.assign({
|
|
1098
|
+
type: 'FeatureCollection',
|
|
1099
|
+
features: results
|
|
1100
|
+
}, pagination)) // If no pagination this merged object will be empty
|
|
1101
|
+
} else if (isPaginated) <span class="branch-0 cbranch-no" title="branch not covered" >{</span>
|
|
1096
1102
|
<span class="cstat-no" title="statement not covered" > // Copy pagination information if any so that client can use it anyway</span>
|
|
1097
1103
|
<span class="cstat-no" title="statement not covered" > _.set(hook, options.dataPath || 'result', Object.assign({</span>
|
|
1098
1104
|
<span class="cstat-no" title="statement not covered" > data: results</span>
|
|
1099
1105
|
<span class="cstat-no" title="statement not covered" > }, pagination))</span>
|
|
1100
|
-
|
|
1101
|
-
|
|
1102
|
-
|
|
1103
|
-
|
|
1104
|
-
|
|
1105
|
-
|
|
1106
|
-
|
|
1107
|
-
|
|
1108
|
-
|
|
1109
|
-
<span class="
|
|
1110
|
-
|
|
1111
|
-
|
|
1112
|
-
|
|
1113
|
-
|
|
1114
|
-
|
|
1115
|
-
|
|
1116
|
-
<span class="
|
|
1117
|
-
|
|
1118
|
-
<span class="
|
|
1119
|
-
|
|
1120
|
-
|
|
1121
|
-
|
|
1122
|
-
<span class="
|
|
1123
|
-
|
|
1124
|
-
|
|
1125
|
-
|
|
1126
|
-
|
|
1127
|
-
|
|
1128
|
-
|
|
1129
|
-
|
|
1130
|
-
|
|
1131
|
-
|
|
1132
|
-
|
|
1133
|
-
|
|
1134
|
-
|
|
1135
|
-
|
|
1136
|
-
|
|
1137
|
-
|
|
1138
|
-
|
|
1139
|
-
|
|
1140
|
-
|
|
1141
|
-
|
|
1142
|
-
|
|
1143
|
-
|
|
1144
|
-
|
|
1145
|
-
|
|
1146
|
-
|
|
1147
|
-
|
|
1148
|
-
|
|
1149
|
-
|
|
1150
|
-
|
|
1151
|
-
|
|
1152
|
-
|
|
1153
|
-
|
|
1154
|
-
|
|
1155
|
-
|
|
1156
|
-
|
|
1157
|
-
|
|
1158
|
-
|
|
1159
|
-
|
|
1160
|
-
|
|
1161
|
-
|
|
1162
|
-
|
|
1163
|
-
|
|
1164
|
-
|
|
1165
|
-
<span class="
|
|
1166
|
-
|
|
1167
|
-
|
|
1168
|
-
|
|
1169
|
-
|
|
1170
|
-
|
|
1171
|
-
|
|
1172
|
-
|
|
1173
|
-
|
|
1174
|
-
|
|
1175
|
-
|
|
1176
|
-
|
|
1177
|
-
|
|
1178
|
-
|
|
1179
|
-
|
|
1180
|
-
|
|
1181
|
-
|
|
1182
|
-
<span class="
|
|
1106
|
+
} else {
|
|
1107
|
+
_.set(hook, options.dataPath || 'result', isFeatureCollection ? results <span class="branch-0 cbranch-no" title="branch not covered" >: results[0])</span>
|
|
1108
|
+
}
|
|
1109
|
+
}
|
|
1110
|
+
}
|
|
1111
|
+
|
|
1112
|
+
export async function aggregateFeaturesQuery (hook) {
|
|
1113
|
+
const query = hook.params.query
|
|
1114
|
+
const service = hook.service
|
|
1115
|
+
if (!query) <span class="branch-0 cbranch-no" title="branch not covered" >return</span>
|
|
1116
|
+
// Perform aggregation
|
|
1117
|
+
if (query.$aggregate) {
|
|
1118
|
+
const collection = service.Model
|
|
1119
|
+
const indexes = await collection.indexes()
|
|
1120
|
+
let featureId = (service.options ? service.options.featureId <span class="branch-0 cbranch-no" title="branch not covered" >: [])</span>
|
|
1121
|
+
// Support compound ID
|
|
1122
|
+
featureId = (Array.isArray(featureId) <span class="branch-0 cbranch-no" title="branch not covered" >? featureId </span>: [featureId])
|
|
1123
|
+
let featureIdType = (service.options ? service.options.featureIdType <span class="branch-0 cbranch-no" title="branch not covered" >: [])</span>
|
|
1124
|
+
featureIdType = (Array.isArray(featureIdType) <span class="branch-0 cbranch-no" title="branch not covered" >? featureIdType </span>: [featureIdType])
|
|
1125
|
+
const ids = typeof query.$groupBy === 'string' // Group by matching ID(s), ie single ID or array of field to create a compound ID
|
|
1126
|
+
? { [query.$groupBy]: '$properties.' + query.$groupBy }
|
|
1127
|
+
// Aggregated in an accumulator to avoid conflict with feature properties
|
|
1128
|
+
<span class="branch-0 cbranch-no" title="branch not covered" > : query.$groupBy.reduce((object, id) => Object.assign(object, { [id]: '$properties.' + id }), {})</span>
|
|
1129
|
+
const groupBy = { _id: ids }
|
|
1130
|
+
let keys = _.keys(ids)
|
|
1131
|
+
// Do we only keep first or last available time ?
|
|
1132
|
+
const singleTime = (_.toNumber(query.$limit) === 1)
|
|
1133
|
+
if (singleTime) {
|
|
1134
|
+
// When single time no aggregation is performed at all so we only have raw features
|
|
1135
|
+
keys = keys.map(key => 'properties.' + key)
|
|
1136
|
+
// In this case no need to aggregate on each element we simply keep the first feature
|
|
1137
|
+
// BUG: according to https://jira.mongodb.org/browse/SERVER-9507 MongoDB is not yet
|
|
1138
|
+
// able to optimize this kind of operations to avoid full index scan
|
|
1139
|
+
// For now we should restrict it to short time range
|
|
1140
|
+
Object.assign(groupBy, { feature: { $first: '$$ROOT' } })
|
|
1141
|
+
} else {
|
|
1142
|
+
Object.assign(groupBy, {
|
|
1143
|
+
time: { $push: '$time' }, // Keep track of all times
|
|
1144
|
+
runTime: { $push: '$runTime' }, // Keep track of all run times
|
|
1145
|
+
type: { $last: '$type' }, // type is assumed similar for all results, keep last
|
|
1146
|
+
properties: { $last: '$properties' } // non-aggregated properties are assumed similar for all results, keep last
|
|
1147
|
+
})
|
|
1148
|
+
// Keep track of all levels as well if not targetting a specific one
|
|
1149
|
+
if (!_.has(query, 'level')) {
|
|
1150
|
+
Object.assign(groupBy, {
|
|
1151
|
+
level: { $push: '$level' }
|
|
1152
|
+
})
|
|
1153
|
+
}
|
|
1154
|
+
// Check if we aggregate geometry or simply properties
|
|
1155
|
+
if (!query.$aggregate.includes('geometry')) {
|
|
1156
|
+
Object.assign(groupBy, {
|
|
1157
|
+
geometry: { $last: '$geometry' } // geometry is assumed similar for all results, keep last
|
|
1158
|
+
})
|
|
1159
|
+
}
|
|
1160
|
+
}
|
|
1161
|
+
// Merge with any additional group expression
|
|
1162
|
+
const group = _.get(query, '$group', {})
|
|
1163
|
+
Object.assign(groupBy, group)
|
|
1164
|
+
// The query contains the match stage except options relevent to the aggregation pipeline
|
|
1165
|
+
const match = _.omit(query, ['$group', '$groupBy', '$aggregate', '$geoNear', '$sort', '$limit', '$skip'])
|
|
1166
|
+
// Check for any required type conversion (eg HTTP requests)
|
|
1167
|
+
for (let i = 0; i < featureId.length; i++) {
|
|
1168
|
+
const id = featureId[i]
|
|
1169
|
+
const idType = featureIdType[i]
|
|
1170
|
+
if (_.has(match, 'properties.' + id)) {
|
|
1171
|
+
if (idType === 'number') <span class="branch-0 cbranch-no" title="branch not covered" >_.set(match, 'properties.' + id, _.toNumber(_.get(match, 'properties.' + id)))</span>
|
|
1172
|
+
}
|
|
1173
|
+
}
|
|
1174
|
+
// Ensure we do not mix results with/without relevant element values
|
|
1175
|
+
// by separately querying each element then merging
|
|
1176
|
+
let aggregatedResults
|
|
1177
|
+
// Associative map used to optimize merging between aggregated elements
|
|
1178
|
+
const aggregatedResultsMap = new Map()
|
|
1179
|
+
const aggregateOptions = {
|
|
1180
|
+
allowDiskUse: true
|
|
1181
|
+
}
|
|
1182
|
+
await Promise.all(query.$aggregate.map(async element => {
|
|
1183
|
+
const isGeometry = (element === 'geometry')
|
|
1184
|
+
// Geometry is a root property while others are feature properties
|
|
1185
|
+
const prefix = (isGeometry ? '' : 'properties.')
|
|
1186
|
+
const pipeline = []
|
|
1187
|
+
// Check for geometry stage
|
|
1188
|
+
if (query.$geoNear) <span class="branch-0 cbranch-no" title="branch not covered" >{</span>
|
|
1183
1189
|
<span class="cstat-no" title="statement not covered" > pipeline.push({ $geoNear: query.$geoNear })</span>
|
|
1184
1190
|
<span class="cstat-no" title="statement not covered" > }</span>
|
|
1185
|
-
|
|
1186
|
-
|
|
1187
|
-
|
|
1188
|
-
|
|
1189
|
-
|
|
1190
|
-
|
|
1191
|
-
|
|
1192
|
-
|
|
1193
|
-
|
|
1194
|
-
|
|
1195
|
-
|
|
1196
|
-
|
|
1197
|
-
|
|
1198
|
-
|
|
1199
|
-
|
|
1200
|
-
|
|
1201
|
-
|
|
1202
|
-
|
|
1203
|
-
|
|
1204
|
-
|
|
1205
|
-
|
|
1206
|
-
|
|
1207
|
-
|
|
1208
|
-
|
|
1209
|
-
|
|
1210
|
-
|
|
1211
|
-
|
|
1212
|
-
|
|
1213
|
-
|
|
1214
|
-
|
|
1215
|
-
|
|
1216
|
-
|
|
1217
|
-
|
|
1218
|
-
|
|
1219
|
-
|
|
1220
|
-
|
|
1221
|
-
|
|
1222
|
-
|
|
1223
|
-
|
|
1224
|
-
|
|
1225
|
-
|
|
1226
|
-
|
|
1227
|
-
|
|
1228
|
-
|
|
1229
|
-
|
|
1230
|
-
|
|
1231
|
-
|
|
1232
|
-
|
|
1233
|
-
|
|
1234
|
-
|
|
1235
|
-
|
|
1236
|
-
|
|
1237
|
-
|
|
1238
|
-
|
|
1239
|
-
|
|
1240
|
-
|
|
1241
|
-
|
|
1242
|
-
|
|
1243
|
-
|
|
1244
|
-
|
|
1245
|
-
|
|
1246
|
-
|
|
1247
|
-
|
|
1248
|
-
|
|
1249
|
-
|
|
1250
|
-
<span class="cstat-no" title="statement not covered" >
|
|
1251
|
-
|
|
1191
|
+
// Find matching features only
|
|
1192
|
+
pipeline.push({ $match: Object.assign({ [prefix + element]: { $exists: true } }, match) })
|
|
1193
|
+
// Ensure they are ordered by increasing time by default,
|
|
1194
|
+
// most recent forecast and lower level first
|
|
1195
|
+
pipeline.push({ $sort: Object.assign({ time: 1, runTime: -1, level: 1 }, query.$sort) })
|
|
1196
|
+
// Keep track of all feature values
|
|
1197
|
+
if (singleTime) {
|
|
1198
|
+
pipeline.push({ $group: groupBy })
|
|
1199
|
+
// As we replace the root document with the feature in this case keep track of any accumlated element before
|
|
1200
|
+
// If the accumulated properties is name maxProperty then we copy it in the feature as feature.properties.maxProperty
|
|
1201
|
+
if (!_.isEmpty(group)) {
|
|
1202
|
+
pipeline.push({
|
|
1203
|
+
$set: _.mapKeys(_.mapValues(group, (value, key) => `$${key}`), (value, key) => `feature.properties.${key}`)
|
|
1204
|
+
})
|
|
1205
|
+
}
|
|
1206
|
+
pipeline.push({ $replaceRoot: { newRoot: '$feature' } })
|
|
1207
|
+
} else {
|
|
1208
|
+
pipeline.push({ $group: Object.assign({ [element]: { $push: '$' + prefix + element } }, groupBy) })
|
|
1209
|
+
}
|
|
1210
|
+
debug(`Aggregating ${element} element for features`)
|
|
1211
|
+
pipeline.forEach(stage => {
|
|
1212
|
+
_.forOwn(stage, (value, key) => debug('Stage', key, value))
|
|
1213
|
+
})
|
|
1214
|
+
const aggregateElementOptions = Object.assign({}, aggregateOptions)
|
|
1215
|
+
debug('Aggregation options', aggregateElementOptions)
|
|
1216
|
+
const elementResults = await collection.aggregate(pipeline, aggregateElementOptions).toArray()
|
|
1217
|
+
debug(`Generated ${elementResults.length} feature(s) for ${element} element, picked first two`, elementResults.slice(0,2))
|
|
1218
|
+
// Rearrange data so that we get ordered arrays indexed by element
|
|
1219
|
+
elementResults.forEach(result => {
|
|
1220
|
+
result.time = { [element]: result.time }
|
|
1221
|
+
if (result.runTime) result.runTime = { [element]: result.runTime }
|
|
1222
|
+
if (!singleTime && !isGeometry) {
|
|
1223
|
+
// Set back the element values as properties because we aggregated in an accumulator
|
|
1224
|
+
// to avoid conflict with non-aggregated feature properties
|
|
1225
|
+
_.set(result, prefix + element, _.get(result, element))
|
|
1226
|
+
// Delete accumulator
|
|
1227
|
+
_.unset(result, element)
|
|
1228
|
+
}
|
|
1229
|
+
})
|
|
1230
|
+
// Now merge with previous element results
|
|
1231
|
+
if (!aggregatedResults) {
|
|
1232
|
+
aggregatedResults = elementResults
|
|
1233
|
+
aggregatedResults.forEach(result => {
|
|
1234
|
+
// Keep track of result in map to improve search later
|
|
1235
|
+
const resultKeys = keys.map(key => _.get(singleTime ? result : result._id, key))
|
|
1236
|
+
const resultKey = resultKeys.join('-')
|
|
1237
|
+
aggregatedResultsMap.set(resultKey, result)
|
|
1238
|
+
})
|
|
1239
|
+
} else {
|
|
1240
|
+
elementResults.forEach(result => {
|
|
1241
|
+
// When single time no aggregation is performed at all so we only have raw features
|
|
1242
|
+
const resultKeys = keys.map(key => _.get(singleTime ? result : result._id, key))
|
|
1243
|
+
/* Optimize previous result search with map, kept the naive code here for reference/debug purpose
|
|
1244
|
+
const previousResult = aggregatedResults.find(aggregatedResult => {
|
|
1245
|
+
const aggregatedResultKeys = keys.map(key => _.get(singleTime ? result : result._id, key))
|
|
1246
|
+
return _.isEqual(aggregatedResultKeys, resultKeys)
|
|
1247
|
+
})
|
|
1248
|
+
*/
|
|
1249
|
+
const resultKey = resultKeys.join('-')
|
|
1250
|
+
const previousResult = aggregatedResultsMap.get(resultKey)
|
|
1251
|
+
// Merge with previous matching feature if any
|
|
1252
|
+
if (previousResult) {
|
|
1253
|
+
Object.assign(previousResult.time, result.time)
|
|
1254
|
+
if (result.runTime) {
|
|
1255
|
+
if (previousResult.runTime) Object.assign(previousResult.runTime, result.runTime)
|
|
1256
|
+
<span class="cstat-no" title="statement not covered" ><span class="branch-0 cbranch-no" title="branch not covered" > else previousResult.runTime = { [element]: result.runTime }</span></span>
|
|
1257
|
+
}
|
|
1258
|
+
_.set(previousResult, prefix + element, _.get(result, prefix + element))
|
|
1259
|
+
}<span class="branch-0 cbranch-no" title="branch not covered" > else {</span>
|
|
1252
1260
|
<span class="cstat-no" title="statement not covered" > aggregatedResults.push(result)</span>
|
|
1261
|
+
<span class="cstat-no" title="statement not covered" > aggregatedResultsMap.set(resultKey, result)</span>
|
|
1253
1262
|
<span class="cstat-no" title="statement not covered" > }</span>
|
|
1254
|
-
|
|
1255
|
-
|
|
1256
|
-
|
|
1257
|
-
|
|
1258
|
-
|
|
1259
|
-
|
|
1260
|
-
|
|
1261
|
-
|
|
1262
|
-
<span class="
|
|
1263
|
-
|
|
1264
|
-
|
|
1265
|
-
|
|
1263
|
+
})
|
|
1264
|
+
}
|
|
1265
|
+
}))
|
|
1266
|
+
delete query.$groupBy
|
|
1267
|
+
delete query.$group
|
|
1268
|
+
delete query.$aggregate
|
|
1269
|
+
delete query.$geoNear
|
|
1270
|
+
// Set result to avoid service DB call
|
|
1271
|
+
hook.result = aggregatedResults <span class="branch-0 cbranch-no" title="branch not covered" >|| []</span>
|
|
1272
|
+
}
|
|
1273
|
+
return hook
|
|
1274
|
+
}
|
|
1266
1275
|
</pre></td></tr></table></pre>
|
|
1267
1276
|
|
|
1268
1277
|
<div class='push'></div><!-- for sticky footer -->
|
|
@@ -1270,7 +1279,7 @@
|
|
|
1270
1279
|
<div class='footer quiet pad2 space-top1 center small'>
|
|
1271
1280
|
Code coverage generated by
|
|
1272
1281
|
<a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
|
|
1273
|
-
at 2025-
|
|
1282
|
+
at 2025-07-24T10:00:20.508Z
|
|
1274
1283
|
</div>
|
|
1275
1284
|
<script src="../../../prettify.js"></script>
|
|
1276
1285
|
<script>
|