@itwin/map-layers-formats 3.6.0-dev.8 → 4.0.0-dev.10
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.rush/temp/operation/build_ci/state.json +1 -1
- package/.rush/temp/operation/cover/state.json +3 -0
- package/.rush/temp/operation/docs/state.json +1 -1
- package/.rush/temp/package-deps_build_ci.json +8 -7
- package/.rush/temp/package-deps_cover.json +36 -0
- package/.rush/temp/package-deps_docs.json +8 -7
- package/.rush/temp/shrinkwrap-deps.json +25 -23
- package/CHANGELOG.json +30 -0
- package/CHANGELOG.md +26 -1
- package/config/rush-project.json +7 -0
- package/lib/cjs/ArcGisFeature/ArcGisFeaturePBF.d.ts.map +1 -1
- package/lib/cjs/ArcGisFeature/ArcGisFeaturePBF.js +1 -4
- package/lib/cjs/ArcGisFeature/ArcGisFeaturePBF.js.map +1 -1
- package/lib/cjs/ArcGisFeature/ArcGisFeatureProvider.d.ts.map +1 -1
- package/lib/cjs/ArcGisFeature/ArcGisFeatureProvider.js +10 -19
- package/lib/cjs/ArcGisFeature/ArcGisFeatureProvider.js.map +1 -1
- package/lib/cjs/test/ArcGisFeature/ArcGisFeatureProvider.test.js +52 -52
- package/lib/cjs/test/ArcGisFeature/ArcGisFeatureProvider.test.js.map +1 -1
- package/lib/cjs/test/coverage/.nyc_output/{5915ac9b-d491-4417-9c9b-5f1c8af16991.json → 83bd5493-125e-4bb5-82e8-0cfcb3eac657.json} +0 -0
- package/lib/cjs/test/coverage/.nyc_output/c1854e0d-b6d0-4044-9478-d969081f8754.json +1 -0
- package/lib/cjs/test/coverage/.nyc_output/processinfo/83bd5493-125e-4bb5-82e8-0cfcb3eac657.json +1 -0
- package/lib/cjs/test/coverage/.nyc_output/processinfo/c1854e0d-b6d0-4044-9478-d969081f8754.json +1 -0
- package/lib/cjs/test/coverage/.nyc_output/processinfo/index.json +1 -1
- package/lib/cjs/test/coverage/cobertura-coverage.xml +300 -308
- package/lib/cjs/test/coverage/lcov-report/index.html +14 -14
- package/lib/cjs/test/coverage/lcov-report/src/ArcGisFeature/ArcGisFeatureFormat.ts.html +1 -1
- package/lib/cjs/test/coverage/lcov-report/src/ArcGisFeature/ArcGisFeatureJSON.ts.html +1 -1
- package/lib/cjs/test/coverage/lcov-report/src/ArcGisFeature/ArcGisFeaturePBF.ts.html +10 -16
- package/lib/cjs/test/coverage/lcov-report/src/ArcGisFeature/ArcGisFeatureProvider.ts.html +16 -49
- package/lib/cjs/test/coverage/lcov-report/src/ArcGisFeature/ArcGisFeatureQuery.ts.html +1 -1
- package/lib/cjs/test/coverage/lcov-report/src/ArcGisFeature/ArcGisFeatureReader.ts.html +1 -1
- package/lib/cjs/test/coverage/lcov-report/src/ArcGisFeature/ArcGisFeatureRenderer.ts.html +1 -1
- package/lib/cjs/test/coverage/lcov-report/src/ArcGisFeature/ArcGisFeatureResponse.ts.html +1 -1
- package/lib/cjs/test/coverage/lcov-report/src/ArcGisFeature/ArcGisSymbologyRenderer.ts.html +1 -1
- package/lib/cjs/test/coverage/lcov-report/src/ArcGisFeature/index.html +21 -21
- package/lib/cjs/test/coverage/lcov-report/src/index.html +1 -1
- package/lib/cjs/test/coverage/lcov-report/src/map-layers-formats.ts.html +1 -1
- package/lib/cjs/test/coverage/lcov-report/src/mapLayersFormats.ts.html +1 -1
- package/lib/cjs/test/coverage/lcov.info +569 -569
- package/lib/cjs/tsconfig.tsbuildinfo +1 -1
- package/lib/esm/ArcGisFeature/ArcGisFeaturePBF.d.ts.map +1 -1
- package/lib/esm/ArcGisFeature/ArcGisFeaturePBF.js +2 -5
- package/lib/esm/ArcGisFeature/ArcGisFeaturePBF.js.map +1 -1
- package/lib/esm/ArcGisFeature/ArcGisFeatureProvider.d.ts.map +1 -1
- package/lib/esm/ArcGisFeature/ArcGisFeatureProvider.js +11 -20
- package/lib/esm/ArcGisFeature/ArcGisFeatureProvider.js.map +1 -1
- package/lib/esm/test/ArcGisFeature/ArcGisFeatureProvider.test.js +52 -52
- package/lib/esm/test/ArcGisFeature/ArcGisFeatureProvider.test.js.map +1 -1
- package/lib/esm/tsconfig.tsbuildinfo +1 -1
- package/lib/test/junit_results.xml +45 -45
- package/map-layers-formats.build.log +2 -2
- package/package.json +12 -12
- package/src/ArcGisFeature/ArcGisFeaturePBF.ts +3 -5
- package/src/ArcGisFeature/ArcGisFeatureProvider.ts +8 -19
- package/src/test/ArcGisFeature/ArcGisFeatureProvider.test.ts +45 -45
- package/lib/cjs/test/coverage/.nyc_output/f467b483-7a60-4740-a604-ffc7965ecd6c.json +0 -1
- package/lib/cjs/test/coverage/.nyc_output/processinfo/5915ac9b-d491-4417-9c9b-5f1c8af16991.json +0 -1
- package/lib/cjs/test/coverage/.nyc_output/processinfo/f467b483-7a60-4740-a604-ffc7965ecd6c.json +0 -1
|
@@ -23,16 +23,16 @@
|
|
|
23
23
|
<div class='clearfix'>
|
|
24
24
|
|
|
25
25
|
<div class='fl pad1y space-right2'>
|
|
26
|
-
<span class="strong">91.
|
|
26
|
+
<span class="strong">91.5% </span>
|
|
27
27
|
<span class="quiet">Statements</span>
|
|
28
|
-
<span class='fraction'>
|
|
28
|
+
<span class='fraction'>646/706</span>
|
|
29
29
|
</div>
|
|
30
30
|
|
|
31
31
|
|
|
32
32
|
<div class='fl pad1y space-right2'>
|
|
33
|
-
<span class="strong">82.
|
|
33
|
+
<span class="strong">82.84% </span>
|
|
34
34
|
<span class="quiet">Branches</span>
|
|
35
|
-
<span class='fraction'>
|
|
35
|
+
<span class='fraction'>483/583</span>
|
|
36
36
|
</div>
|
|
37
37
|
|
|
38
38
|
|
|
@@ -44,9 +44,9 @@
|
|
|
44
44
|
|
|
45
45
|
|
|
46
46
|
<div class='fl pad1y space-right2'>
|
|
47
|
-
<span class="strong">91.
|
|
47
|
+
<span class="strong">91.37% </span>
|
|
48
48
|
<span class="quiet">Lines</span>
|
|
49
|
-
<span class='fraction'>
|
|
49
|
+
<span class='fraction'>636/696</span>
|
|
50
50
|
</div>
|
|
51
51
|
|
|
52
52
|
|
|
@@ -95,17 +95,17 @@
|
|
|
95
95
|
|
|
96
96
|
<tr>
|
|
97
97
|
<td class="file high" data-value="src/ArcGisFeature"><a href="src/ArcGisFeature/index.html">src/ArcGisFeature</a></td>
|
|
98
|
-
<td data-value="91.
|
|
98
|
+
<td data-value="91.82" class="pic high">
|
|
99
99
|
<div class="chart"><div class="cover-fill" style="width: 91%"></div><div class="cover-empty" style="width: 9%"></div></div>
|
|
100
100
|
</td>
|
|
101
|
-
<td data-value="91.
|
|
102
|
-
<td data-value="
|
|
103
|
-
<td data-value="83.
|
|
104
|
-
<td data-value="
|
|
101
|
+
<td data-value="91.82" class="pct high">91.82%</td>
|
|
102
|
+
<td data-value="697" class="abs high">640/697</td>
|
|
103
|
+
<td data-value="83.13" class="pct high">83.13%</td>
|
|
104
|
+
<td data-value="581" class="abs high">483/581</td>
|
|
105
105
|
<td data-value="93.5" class="pct high">93.5%</td>
|
|
106
106
|
<td data-value="77" class="abs high">72/77</td>
|
|
107
|
-
<td data-value="91.
|
|
108
|
-
<td data-value="
|
|
107
|
+
<td data-value="91.7" class="pct high">91.7%</td>
|
|
108
|
+
<td data-value="687" class="abs high">630/687</td>
|
|
109
109
|
</tr>
|
|
110
110
|
|
|
111
111
|
</tbody>
|
|
@@ -116,7 +116,7 @@
|
|
|
116
116
|
<div class='footer quiet pad2 space-top1 center small'>
|
|
117
117
|
Code coverage generated by
|
|
118
118
|
<a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
|
|
119
|
-
at
|
|
119
|
+
at 2023-02-09T05:17:50.776Z
|
|
120
120
|
</div>
|
|
121
121
|
<script src="prettify.js"></script>
|
|
122
122
|
<script>
|
|
@@ -118,7 +118,7 @@ export class ArcGisFeatureMapLayerFormat extends ImageryMapLayerFormat {
|
|
|
118
118
|
<div class='footer quiet pad2 space-top1 center small'>
|
|
119
119
|
Code coverage generated by
|
|
120
120
|
<a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
|
|
121
|
-
at
|
|
121
|
+
at 2023-02-09T05:17:50.776Z
|
|
122
122
|
</div>
|
|
123
123
|
<script src="../../prettify.js"></script>
|
|
124
124
|
<script>
|
|
@@ -535,7 +535,7 @@ export class ArcGisFeatureJSON extends ArcGisFeatureReader {
|
|
|
535
535
|
<div class='footer quiet pad2 space-top1 center small'>
|
|
536
536
|
Code coverage generated by
|
|
537
537
|
<a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
|
|
538
|
-
at
|
|
538
|
+
at 2023-02-09T05:17:50.776Z
|
|
539
539
|
</div>
|
|
540
540
|
<script src="../../prettify.js"></script>
|
|
541
541
|
<script>
|
|
@@ -23,9 +23,9 @@
|
|
|
23
23
|
<div class='clearfix'>
|
|
24
24
|
|
|
25
25
|
<div class='fl pad1y space-right2'>
|
|
26
|
-
<span class="strong">
|
|
26
|
+
<span class="strong">86.88% </span>
|
|
27
27
|
<span class="quiet">Statements</span>
|
|
28
|
-
<span class='fraction'>
|
|
28
|
+
<span class='fraction'>106/122</span>
|
|
29
29
|
</div>
|
|
30
30
|
|
|
31
31
|
|
|
@@ -44,9 +44,9 @@
|
|
|
44
44
|
|
|
45
45
|
|
|
46
46
|
<div class='fl pad1y space-right2'>
|
|
47
|
-
<span class="strong">
|
|
47
|
+
<span class="strong">86.88% </span>
|
|
48
48
|
<span class="quiet">Lines</span>
|
|
49
|
-
<span class='fraction'>
|
|
49
|
+
<span class='fraction'>106/122</span>
|
|
50
50
|
</div>
|
|
51
51
|
|
|
52
52
|
|
|
@@ -278,9 +278,7 @@
|
|
|
278
278
|
<a name='L213'></a><a href='#L213'>213</a>
|
|
279
279
|
<a name='L214'></a><a href='#L214'>214</a>
|
|
280
280
|
<a name='L215'></a><a href='#L215'>215</a>
|
|
281
|
-
<a name='L216'></a><a href='#L216'>216</a>
|
|
282
|
-
<a name='L217'></a><a href='#L217'>217</a>
|
|
283
|
-
<a name='L218'></a><a href='#L218'>218</a></td><td class="line-coverage quiet"><span class="cline-any cline-neutral"> </span>
|
|
281
|
+
<a name='L216'></a><a href='#L216'>216</a></td><td class="line-coverage quiet"><span class="cline-any cline-neutral"> </span>
|
|
284
282
|
<span class="cline-any cline-neutral"> </span>
|
|
285
283
|
<span class="cline-any cline-neutral"> </span>
|
|
286
284
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -331,7 +329,6 @@
|
|
|
331
329
|
<span class="cline-any cline-yes">2x</span>
|
|
332
330
|
<span class="cline-any cline-yes">2x</span>
|
|
333
331
|
<span class="cline-any cline-yes">2x</span>
|
|
334
|
-
<span class="cline-any cline-yes">2x</span>
|
|
335
332
|
<span class="cline-any cline-neutral"> </span>
|
|
336
333
|
<span class="cline-any cline-neutral"> </span>
|
|
337
334
|
<span class="cline-any cline-yes">5x</span>
|
|
@@ -356,8 +353,7 @@
|
|
|
356
353
|
<span class="cline-any cline-neutral"> </span>
|
|
357
354
|
<span class="cline-any cline-neutral"> </span>
|
|
358
355
|
<span class="cline-any cline-yes">5x</span>
|
|
359
|
-
<span class="cline-any cline-
|
|
360
|
-
<span class="cline-any cline-yes">1x</span>
|
|
356
|
+
<span class="cline-any cline-neutral"> </span>
|
|
361
357
|
<span class="cline-any cline-yes">1x</span>
|
|
362
358
|
<span class="cline-any cline-neutral"> </span>
|
|
363
359
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -509,7 +505,7 @@ import { PrimitiveValue, PropertyValueFormat, StandardTypeNames } from "@itwin/a
|
|
|
509
505
|
import { ImageMapLayerSettings } from "@itwin/core-common";
|
|
510
506
|
import { ArcGisFeatureReader } from "./ArcGisFeatureReader";
|
|
511
507
|
import { ArcGisResponseData } from "./ArcGisFeatureResponse";
|
|
512
|
-
import {
|
|
508
|
+
import { Logger } from "@itwin/core-bentley";
|
|
513
509
|
import { ArcGisFeatureGeometryType } from "./ArcGisFeatureQuery";
|
|
514
510
|
|
|
515
511
|
const esriGeometryType = esriPBuffer.FeatureCollectionPBuffer.GeometryType;
|
|
@@ -546,7 +542,6 @@ export class ArcGisFeaturePBF extends ArcGisFeatureReader {
|
|
|
546
542
|
public readAndRender(response: ArcGisResponseData, renderer: ArcGisFeatureRenderer) {
|
|
547
543
|
if (!(response.data instanceof esriPBuffer.FeatureCollectionPBuffer)) {
|
|
548
544
|
const msg = "Response was not in PBF format";
|
|
549
|
-
assert(!msg);
|
|
550
545
|
Logger.logError(loggerCategory, msg);
|
|
551
546
|
return;
|
|
552
547
|
}
|
|
@@ -573,9 +568,8 @@ export class ArcGisFeaturePBF extends ArcGisFeatureReader {
|
|
|
573
568
|
|
|
574
569
|
public readFeatureInfo(response: ArcGisResponseData, featureInfos: MapLayerFeatureInfo[]) {
|
|
575
570
|
if (!(response.data instanceof esriPBuffer.FeatureCollectionPBuffer)) {
|
|
576
|
-
|
|
577
|
-
|
|
578
|
-
Logger.logError(loggerCategory, msg);
|
|
571
|
+
|
|
572
|
+
Logger.logError(loggerCategory, "Response was not in PBF format");
|
|
579
573
|
}
|
|
580
574
|
|
|
581
575
|
const collection = response.data as esriPBuffer.FeatureCollectionPBuffer;
|
|
@@ -721,7 +715,7 @@ export class ArcGisFeaturePBF extends ArcGisFeatureReader {
|
|
|
721
715
|
<div class='footer quiet pad2 space-top1 center small'>
|
|
722
716
|
Code coverage generated by
|
|
723
717
|
<a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
|
|
724
|
-
at
|
|
718
|
+
at 2023-02-09T05:17:50.776Z
|
|
725
719
|
</div>
|
|
726
720
|
<script src="../../prettify.js"></script>
|
|
727
721
|
<script>
|
|
@@ -23,16 +23,16 @@
|
|
|
23
23
|
<div class='clearfix'>
|
|
24
24
|
|
|
25
25
|
<div class='fl pad1y space-right2'>
|
|
26
|
-
<span class="strong">
|
|
26
|
+
<span class="strong">88.28% </span>
|
|
27
27
|
<span class="quiet">Statements</span>
|
|
28
|
-
<span class='fraction'>
|
|
28
|
+
<span class='fraction'>211/239</span>
|
|
29
29
|
</div>
|
|
30
30
|
|
|
31
31
|
|
|
32
32
|
<div class='fl pad1y space-right2'>
|
|
33
|
-
<span class="strong">82.
|
|
33
|
+
<span class="strong">82.87% </span>
|
|
34
34
|
<span class="quiet">Branches</span>
|
|
35
|
-
<span class='fraction'>
|
|
35
|
+
<span class='fraction'>150/181</span>
|
|
36
36
|
</div>
|
|
37
37
|
|
|
38
38
|
|
|
@@ -44,9 +44,9 @@
|
|
|
44
44
|
|
|
45
45
|
|
|
46
46
|
<div class='fl pad1y space-right2'>
|
|
47
|
-
<span class="strong">
|
|
47
|
+
<span class="strong">88.18% </span>
|
|
48
48
|
<span class="quiet">Lines</span>
|
|
49
|
-
<span class='fraction'>
|
|
49
|
+
<span class='fraction'>209/237</span>
|
|
50
50
|
</div>
|
|
51
51
|
|
|
52
52
|
|
|
@@ -550,18 +550,7 @@
|
|
|
550
550
|
<a name='L485'></a><a href='#L485'>485</a>
|
|
551
551
|
<a name='L486'></a><a href='#L486'>486</a>
|
|
552
552
|
<a name='L487'></a><a href='#L487'>487</a>
|
|
553
|
-
<a name='L488'></a><a href='#L488'>488</a>
|
|
554
|
-
<a name='L489'></a><a href='#L489'>489</a>
|
|
555
|
-
<a name='L490'></a><a href='#L490'>490</a>
|
|
556
|
-
<a name='L491'></a><a href='#L491'>491</a>
|
|
557
|
-
<a name='L492'></a><a href='#L492'>492</a>
|
|
558
|
-
<a name='L493'></a><a href='#L493'>493</a>
|
|
559
|
-
<a name='L494'></a><a href='#L494'>494</a>
|
|
560
|
-
<a name='L495'></a><a href='#L495'>495</a>
|
|
561
|
-
<a name='L496'></a><a href='#L496'>496</a>
|
|
562
|
-
<a name='L497'></a><a href='#L497'>497</a>
|
|
563
|
-
<a name='L498'></a><a href='#L498'>498</a>
|
|
564
|
-
<a name='L499'></a><a href='#L499'>499</a></td><td class="line-coverage quiet"><span class="cline-any cline-neutral"> </span>
|
|
553
|
+
<a name='L488'></a><a href='#L488'>488</a></td><td class="line-coverage quiet"><span class="cline-any cline-neutral"> </span>
|
|
565
554
|
<span class="cline-any cline-neutral"> </span>
|
|
566
555
|
<span class="cline-any cline-neutral"> </span>
|
|
567
556
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -614,15 +603,9 @@
|
|
|
614
603
|
<span class="cline-any cline-neutral"> </span>
|
|
615
604
|
<span class="cline-any cline-neutral"> </span>
|
|
616
605
|
<span class="cline-any cline-neutral"> </span>
|
|
617
|
-
<span class="cline-any cline-neutral"> </span>
|
|
618
|
-
<span class="cline-any cline-neutral"> </span>
|
|
619
606
|
<span class="cline-any cline-yes">26x</span>
|
|
620
607
|
<span class="cline-any cline-yes">26x</span>
|
|
621
608
|
<span class="cline-any cline-neutral"> </span>
|
|
622
|
-
<span class="cline-any cline-neutral"> </span>
|
|
623
|
-
<span class="cline-any cline-neutral"> </span>
|
|
624
|
-
<span class="cline-any cline-neutral"> </span>
|
|
625
|
-
<span class="cline-any cline-neutral"> </span>
|
|
626
609
|
<span class="cline-any cline-yes">26x</span>
|
|
627
610
|
<span class="cline-any cline-yes">1x</span>
|
|
628
611
|
<span class="cline-any cline-yes">1x</span>
|
|
@@ -633,7 +616,6 @@
|
|
|
633
616
|
<span class="cline-any cline-yes">1x</span>
|
|
634
617
|
<span class="cline-any cline-yes">1x</span>
|
|
635
618
|
<span class="cline-any cline-yes">1x</span>
|
|
636
|
-
<span class="cline-any cline-yes">1x</span>
|
|
637
619
|
<span class="cline-any cline-neutral"> </span>
|
|
638
620
|
<span class="cline-any cline-neutral"> </span>
|
|
639
621
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -903,7 +885,6 @@
|
|
|
903
885
|
<span class="cline-any cline-neutral"> </span>
|
|
904
886
|
<span class="cline-any cline-yes">2x</span>
|
|
905
887
|
<span class="cline-any cline-yes">1x</span>
|
|
906
|
-
<span class="cline-any cline-yes">1x</span>
|
|
907
888
|
<span class="cline-any cline-neutral"> </span>
|
|
908
889
|
<span class="cline-any cline-neutral"> </span>
|
|
909
890
|
<span class="cline-any cline-yes">1x</span>
|
|
@@ -962,13 +943,11 @@
|
|
|
962
943
|
<span class="cline-any cline-yes">3x</span>
|
|
963
944
|
<span class="cline-any cline-no"> </span>
|
|
964
945
|
<span class="cline-any cline-no"> </span>
|
|
965
|
-
<span class="cline-any cline-no"> </span>
|
|
966
946
|
<span class="cline-any cline-neutral"> </span>
|
|
967
947
|
<span class="cline-any cline-neutral"> </span>
|
|
968
948
|
<span class="cline-any cline-yes">3x</span>
|
|
969
949
|
<span class="cline-any cline-no"> </span>
|
|
970
950
|
<span class="cline-any cline-no"> </span>
|
|
971
|
-
<span class="cline-any cline-no"> </span>
|
|
972
951
|
<span class="cline-any cline-neutral"> </span>
|
|
973
952
|
<span class="cline-any cline-yes">3x</span>
|
|
974
953
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -978,7 +957,6 @@
|
|
|
978
957
|
<span class="cline-any cline-yes">2x</span>
|
|
979
958
|
<span class="cline-any cline-yes">2x</span>
|
|
980
959
|
<span class="cline-any cline-no"> </span>
|
|
981
|
-
<span class="cline-any cline-no"> </span>
|
|
982
960
|
<span class="cline-any cline-neutral"> </span>
|
|
983
961
|
<span class="cline-any cline-neutral"> </span>
|
|
984
962
|
<span class="cline-any cline-neutral"> </span>
|
|
@@ -1065,9 +1043,9 @@
|
|
|
1065
1043
|
*--------------------------------------------------------------------------------------------*/
|
|
1066
1044
|
|
|
1067
1045
|
import { Cartographic, ImageMapLayerSettings, ImageSource, ImageSourceFormat, ServerError } from "@itwin/core-common";
|
|
1068
|
-
import {
|
|
1046
|
+
import { base64StringToUint8Array, IModelStatus, Logger } from "@itwin/core-bentley";
|
|
1069
1047
|
import { Matrix4d, Point3d, Range2d, Transform } from "@itwin/core-geometry";
|
|
1070
|
-
import { ArcGisErrorCode, ArcGISImageryProvider, ArcGisUtilities, ImageryMapTileTree, MapCartoRectangle, MapLayerFeatureInfo, MapLayerImageryProviderStatus, QuadId } from "@itwin/core-frontend";
|
|
1048
|
+
import { ArcGisErrorCode, ArcGISImageryProvider, ArcGISServiceMetadata, ArcGisUtilities, ImageryMapTileTree, MapCartoRectangle, MapLayerFeatureInfo, MapLayerImageryProviderStatus, QuadId } from "@itwin/core-frontend";
|
|
1071
1049
|
import { ArcGisSymbologyRenderer } from "./ArcGisSymbologyRenderer";
|
|
1072
1050
|
import { ArcGisExtent, ArcGisFeatureFormat, ArcGisFeatureQuery, ArcGisGeometry, FeatureQueryQuantizationParams } from "./ArcGisFeatureQuery";
|
|
1073
1051
|
import { ArcGisFeatureRenderer } from "./ArcGisFeatureRenderer";
|
|
@@ -1112,14 +1090,8 @@ export class ArcGisFeatureProvider extends ArcGISImageryProvider {
|
|
|
1112
1090
|
}
|
|
1113
1091
|
|
|
1114
1092
|
public override async initialize(): Promise<void> {
|
|
1115
|
-
|
|
1116
|
-
|
|
1117
|
-
try {
|
|
1118
|
-
json = await ArcGisUtilities.getServiceJson(this._settings.url, this._settings.formatId, this._settings.userName, this._settings.password);
|
|
1119
|
-
|
|
1120
|
-
} catch (_e) {
|
|
1121
|
-
|
|
1122
|
-
}
|
|
1093
|
+
const metadata = await this.getServiceJson();
|
|
1094
|
+
const json = metadata?.content;
|
|
1123
1095
|
|
|
1124
1096
|
if (json === undefined) {
|
|
1125
1097
|
Logger.logError(loggerCategory, "Could not get service JSON");
|
|
@@ -1129,8 +1101,7 @@ export class ArcGisFeatureProvider extends ArcGISImageryProvider {
|
|
|
1129
1101
|
if (json<span class="branch-0 cbranch-no" title="branch not covered" >?.e</span>rror?.code === ArcGisErrorCode.TokenRequired || json<span class="branch-0 cbranch-no" title="branch not covered" >?.e</span>rror<span class="branch-1 cbranch-no" title="branch not covered" >?.code </span>=== ArcGisErrorCode.InvalidToken) {
|
|
1130
1102
|
// Check again layer status, it might have change during await.
|
|
1131
1103
|
<span class="missing-if-branch" title="else path not taken" >E</span>if (this.status === MapLayerImageryProviderStatus.Valid) {
|
|
1132
|
-
this.
|
|
1133
|
-
this.onStatusChanged.raiseEvent(this);
|
|
1104
|
+
this.setStatus(MapLayerImageryProviderStatus.RequireAuth);
|
|
1134
1105
|
return;
|
|
1135
1106
|
}
|
|
1136
1107
|
}
|
|
@@ -1262,15 +1233,15 @@ export class ArcGisFeatureProvider extends ArcGISImageryProvider {
|
|
|
1262
1233
|
}
|
|
1263
1234
|
|
|
1264
1235
|
protected async getLayerMetadata(layerId: number) {
|
|
1265
|
-
let
|
|
1236
|
+
let metadata: ArcGISServiceMetadata|undefined;
|
|
1266
1237
|
try {
|
|
1267
1238
|
const url = new URL(this._settings.url);
|
|
1268
1239
|
url.pathname = `${url.pathname}/${layerId}`;
|
|
1269
|
-
|
|
1240
|
+
metadata = await ArcGisUtilities.getServiceJson(url.toString(), this._settings.formatId, this._settings.userName, this._settings.password, this._accessTokenRequired);
|
|
1270
1241
|
} catch {
|
|
1271
1242
|
|
|
1272
1243
|
}
|
|
1273
|
-
return
|
|
1244
|
+
return metadata<span class="branch-0 cbranch-no" title="branch not covered" >?.c</span>ontent;
|
|
1274
1245
|
}
|
|
1275
1246
|
|
|
1276
1247
|
public override get tileSize(): number { return 512; }
|
|
@@ -1400,7 +1371,6 @@ export class ArcGisFeatureProvider extends ArcGISImageryProvider {
|
|
|
1400
1371
|
|
|
1401
1372
|
private async fetchTile(row: number, column: number, zoomLevel: number, refineEnvelope?: ArcGisExtent): Promise<ArcGisFeatureResponse | undefined> {
|
|
1402
1373
|
if (!this.format) {
|
|
1403
|
-
assert(!"No supported query format");
|
|
1404
1374
|
return undefined;
|
|
1405
1375
|
}
|
|
1406
1376
|
|
|
@@ -1459,13 +1429,11 @@ export class ArcGisFeatureProvider extends ArcGISImageryProvider {
|
|
|
1459
1429
|
const ctx = canvas.getContext("2d");
|
|
1460
1430
|
<span class="missing-if-branch" title="if path not taken" >I</span>if (ctx == null) {
|
|
1461
1431
|
<span class="cstat-no" title="statement not covered" > Logger.logError(loggerCategory, "No canvas context available for loading tile.");</span>
|
|
1462
|
-
<span class="cstat-no" title="statement not covered" > assert(!"no canvas context");</span>
|
|
1463
1432
|
<span class="cstat-no" title="statement not covered" > return undefined;</span>
|
|
1464
1433
|
}
|
|
1465
1434
|
|
|
1466
1435
|
<span class="missing-if-branch" title="if path not taken" >I</span>if (!this._symbologyRenderer) {
|
|
1467
1436
|
<span class="cstat-no" title="statement not covered" > Logger.logError(loggerCategory, "No symbology renderer available for loading tile.");</span>
|
|
1468
|
-
<span class="cstat-no" title="statement not covered" > assert(!"No symbology renderer");</span>
|
|
1469
1437
|
<span class="cstat-no" title="statement not covered" > return undefined;</span>
|
|
1470
1438
|
}
|
|
1471
1439
|
try {
|
|
@@ -1476,7 +1444,6 @@ export class ArcGisFeatureProvider extends ArcGISImageryProvider {
|
|
|
1476
1444
|
transfo = this.computeTileWorld2CanvasTransform(row, column, zoomLevel);
|
|
1477
1445
|
<span class="missing-if-branch" title="if path not taken" >I</span>if (!transfo) {
|
|
1478
1446
|
<span class="cstat-no" title="statement not covered" > Logger.logError(loggerCategory, `Could not compute data transformation for tile (${zoomLevel}/${row}/${column})`);</span>
|
|
1479
|
-
<span class="cstat-no" title="statement not covered" > assert(!"Could not compute world to canvas transform");</span>
|
|
1480
1447
|
}
|
|
1481
1448
|
}
|
|
1482
1449
|
|
|
@@ -1564,7 +1531,7 @@ export class ArcGisFeatureProvider extends ArcGISImageryProvider {
|
|
|
1564
1531
|
<div class='footer quiet pad2 space-top1 center small'>
|
|
1565
1532
|
Code coverage generated by
|
|
1566
1533
|
<a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
|
|
1567
|
-
at
|
|
1534
|
+
at 2023-02-09T05:17:50.776Z
|
|
1568
1535
|
</div>
|
|
1569
1536
|
<script src="../../prettify.js"></script>
|
|
1570
1537
|
<script>
|
|
@@ -748,7 +748,7 @@ export class ArcGisFeatureQuery {
|
|
|
748
748
|
<div class='footer quiet pad2 space-top1 center small'>
|
|
749
749
|
Code coverage generated by
|
|
750
750
|
<a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
|
|
751
|
-
at
|
|
751
|
+
at 2023-02-09T05:17:50.776Z
|
|
752
752
|
</div>
|
|
753
753
|
<script src="../../prettify.js"></script>
|
|
754
754
|
<script>
|
|
@@ -208,7 +208,7 @@ export abstract class ArcGisFeatureReader {
|
|
|
208
208
|
<div class='footer quiet pad2 space-top1 center small'>
|
|
209
209
|
Code coverage generated by
|
|
210
210
|
<a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
|
|
211
|
-
at
|
|
211
|
+
at 2023-02-09T05:17:50.776Z
|
|
212
212
|
</div>
|
|
213
213
|
<script src="../../prettify.js"></script>
|
|
214
214
|
<script>
|
|
@@ -583,7 +583,7 @@ export class ArcGisFeatureRenderer {
|
|
|
583
583
|
<div class='footer quiet pad2 space-top1 center small'>
|
|
584
584
|
Code coverage generated by
|
|
585
585
|
<a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
|
|
586
|
-
at
|
|
586
|
+
at 2023-02-09T05:17:50.776Z
|
|
587
587
|
</div>
|
|
588
588
|
<script src="../../prettify.js"></script>
|
|
589
589
|
<script>
|
|
@@ -286,7 +286,7 @@ export class ArcGisFeatureResponse {
|
|
|
286
286
|
<div class='footer quiet pad2 space-top1 center small'>
|
|
287
287
|
Code coverage generated by
|
|
288
288
|
<a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
|
|
289
|
-
at
|
|
289
|
+
at 2023-02-09T05:17:50.776Z
|
|
290
290
|
</div>
|
|
291
291
|
<script src="../../prettify.js"></script>
|
|
292
292
|
<script>
|
|
@@ -817,7 +817,7 @@ export class ArcGisSymbologyRenderer {
|
|
|
817
817
|
<div class='footer quiet pad2 space-top1 center small'>
|
|
818
818
|
Code coverage generated by
|
|
819
819
|
<a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
|
|
820
|
-
at
|
|
820
|
+
at 2023-02-09T05:17:50.776Z
|
|
821
821
|
</div>
|
|
822
822
|
<script src="../../prettify.js"></script>
|
|
823
823
|
<script>
|
|
@@ -23,16 +23,16 @@
|
|
|
23
23
|
<div class='clearfix'>
|
|
24
24
|
|
|
25
25
|
<div class='fl pad1y space-right2'>
|
|
26
|
-
<span class="strong">91.
|
|
26
|
+
<span class="strong">91.82% </span>
|
|
27
27
|
<span class="quiet">Statements</span>
|
|
28
|
-
<span class='fraction'>
|
|
28
|
+
<span class='fraction'>640/697</span>
|
|
29
29
|
</div>
|
|
30
30
|
|
|
31
31
|
|
|
32
32
|
<div class='fl pad1y space-right2'>
|
|
33
|
-
<span class="strong">83.
|
|
33
|
+
<span class="strong">83.13% </span>
|
|
34
34
|
<span class="quiet">Branches</span>
|
|
35
|
-
<span class='fraction'>
|
|
35
|
+
<span class='fraction'>483/581</span>
|
|
36
36
|
</div>
|
|
37
37
|
|
|
38
38
|
|
|
@@ -44,9 +44,9 @@
|
|
|
44
44
|
|
|
45
45
|
|
|
46
46
|
<div class='fl pad1y space-right2'>
|
|
47
|
-
<span class="strong">91.
|
|
47
|
+
<span class="strong">91.7% </span>
|
|
48
48
|
<span class="quiet">Lines</span>
|
|
49
|
-
<span class='fraction'>
|
|
49
|
+
<span class='fraction'>630/687</span>
|
|
50
50
|
</div>
|
|
51
51
|
|
|
52
52
|
|
|
@@ -110,32 +110,32 @@
|
|
|
110
110
|
|
|
111
111
|
<tr>
|
|
112
112
|
<td class="file high" data-value="ArcGisFeaturePBF.ts"><a href="ArcGisFeaturePBF.ts.html">ArcGisFeaturePBF.ts</a></td>
|
|
113
|
-
<td data-value="
|
|
114
|
-
<div class="chart"><div class="cover-fill" style="width:
|
|
113
|
+
<td data-value="86.88" class="pic high">
|
|
114
|
+
<div class="chart"><div class="cover-fill" style="width: 86%"></div><div class="cover-empty" style="width: 14%"></div></div>
|
|
115
115
|
</td>
|
|
116
|
-
<td data-value="
|
|
117
|
-
<td data-value="
|
|
116
|
+
<td data-value="86.88" class="pct high">86.88%</td>
|
|
117
|
+
<td data-value="122" class="abs high">106/122</td>
|
|
118
118
|
<td data-value="80.7" class="pct high">80.7%</td>
|
|
119
119
|
<td data-value="114" class="abs high">92/114</td>
|
|
120
120
|
<td data-value="100" class="pct high">100%</td>
|
|
121
121
|
<td data-value="6" class="abs high">6/6</td>
|
|
122
|
-
<td data-value="
|
|
123
|
-
<td data-value="
|
|
122
|
+
<td data-value="86.88" class="pct high">86.88%</td>
|
|
123
|
+
<td data-value="122" class="abs high">106/122</td>
|
|
124
124
|
</tr>
|
|
125
125
|
|
|
126
126
|
<tr>
|
|
127
127
|
<td class="file high" data-value="ArcGisFeatureProvider.ts"><a href="ArcGisFeatureProvider.ts.html">ArcGisFeatureProvider.ts</a></td>
|
|
128
|
-
<td data-value="
|
|
129
|
-
<div class="chart"><div class="cover-fill" style="width:
|
|
128
|
+
<td data-value="88.28" class="pic high">
|
|
129
|
+
<div class="chart"><div class="cover-fill" style="width: 88%"></div><div class="cover-empty" style="width: 12%"></div></div>
|
|
130
130
|
</td>
|
|
131
|
-
<td data-value="
|
|
132
|
-
<td data-value="
|
|
133
|
-
<td data-value="82.
|
|
134
|
-
<td data-value="
|
|
131
|
+
<td data-value="88.28" class="pct high">88.28%</td>
|
|
132
|
+
<td data-value="239" class="abs high">211/239</td>
|
|
133
|
+
<td data-value="82.87" class="pct high">82.87%</td>
|
|
134
|
+
<td data-value="181" class="abs high">150/181</td>
|
|
135
135
|
<td data-value="82.35" class="pct high">82.35%</td>
|
|
136
136
|
<td data-value="17" class="abs high">14/17</td>
|
|
137
|
-
<td data-value="
|
|
138
|
-
<td data-value="
|
|
137
|
+
<td data-value="88.18" class="pct high">88.18%</td>
|
|
138
|
+
<td data-value="237" class="abs high">209/237</td>
|
|
139
139
|
</tr>
|
|
140
140
|
|
|
141
141
|
<tr>
|
|
@@ -221,7 +221,7 @@
|
|
|
221
221
|
<div class='footer quiet pad2 space-top1 center small'>
|
|
222
222
|
Code coverage generated by
|
|
223
223
|
<a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
|
|
224
|
-
at
|
|
224
|
+
at 2023-02-09T05:17:50.776Z
|
|
225
225
|
</div>
|
|
226
226
|
<script src="../../prettify.js"></script>
|
|
227
227
|
<script>
|
|
@@ -116,7 +116,7 @@
|
|
|
116
116
|
<div class='footer quiet pad2 space-top1 center small'>
|
|
117
117
|
Code coverage generated by
|
|
118
118
|
<a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
|
|
119
|
-
at
|
|
119
|
+
at 2023-02-09T05:17:50.776Z
|
|
120
120
|
</div>
|
|
121
121
|
<script src="../prettify.js"></script>
|
|
122
122
|
<script>
|
|
@@ -115,7 +115,7 @@ export * from "./ArcGisFeature/ArcGisFeatureProvider";
|
|
|
115
115
|
<div class='footer quiet pad2 space-top1 center small'>
|
|
116
116
|
Code coverage generated by
|
|
117
117
|
<a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
|
|
118
|
-
at
|
|
118
|
+
at 2023-02-09T05:17:50.776Z
|
|
119
119
|
</div>
|
|
120
120
|
<script src="../prettify.js"></script>
|
|
121
121
|
<script>
|
|
@@ -148,7 +148,7 @@ export class MapLayersFormats {
|
|
|
148
148
|
<div class='footer quiet pad2 space-top1 center small'>
|
|
149
149
|
Code coverage generated by
|
|
150
150
|
<a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
|
|
151
|
-
at
|
|
151
|
+
at 2023-02-09T05:17:50.776Z
|
|
152
152
|
</div>
|
|
153
153
|
<script src="../prettify.js"></script>
|
|
154
154
|
<script>
|