@itwin/core-frontend 4.1.0-dev.54 → 4.1.0-dev.56
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/lib/cjs/BackgroundMapGeometry.d.ts +1 -0
- package/lib/cjs/BackgroundMapGeometry.d.ts.map +1 -1
- package/lib/cjs/BackgroundMapGeometry.js +29 -0
- package/lib/cjs/BackgroundMapGeometry.js.map +1 -1
- package/lib/cjs/HitDetail.d.ts.map +1 -1
- package/lib/cjs/HitDetail.js +1 -1
- package/lib/cjs/HitDetail.js.map +1 -1
- package/lib/cjs/IModelConnection.d.ts +22 -4
- package/lib/cjs/IModelConnection.d.ts.map +1 -1
- package/lib/cjs/IModelConnection.js +32 -8
- package/lib/cjs/IModelConnection.js.map +1 -1
- package/lib/cjs/Viewport.d.ts +5 -5
- package/lib/cjs/Viewport.d.ts.map +1 -1
- package/lib/cjs/Viewport.js +6 -6
- package/lib/cjs/Viewport.js.map +1 -1
- package/lib/cjs/tile/internal.d.ts +4 -0
- package/lib/cjs/tile/internal.d.ts.map +1 -1
- package/lib/cjs/tile/internal.js +4 -0
- package/lib/cjs/tile/internal.js.map +1 -1
- package/lib/cjs/tile/map/ImageryProviders/ArcGISImageryProvider.d.ts +2 -0
- package/lib/cjs/tile/map/ImageryProviders/ArcGISImageryProvider.d.ts.map +1 -1
- package/lib/cjs/tile/map/ImageryProviders/ArcGISImageryProvider.js +2 -0
- package/lib/cjs/tile/map/ImageryProviders/ArcGISImageryProvider.js.map +1 -1
- package/lib/cjs/tile/map/ImageryProviders/ArcGISMapLayerImageryProvider.d.ts +55 -2
- package/lib/cjs/tile/map/ImageryProviders/ArcGISMapLayerImageryProvider.d.ts.map +1 -1
- package/lib/cjs/tile/map/ImageryProviders/ArcGISMapLayerImageryProvider.js +96 -23
- package/lib/cjs/tile/map/ImageryProviders/ArcGISMapLayerImageryProvider.js.map +1 -1
- package/lib/cjs/tile/map/ImageryProviders/ArcGisGeometryReaderJSON.d.ts +15 -0
- package/lib/cjs/tile/map/ImageryProviders/ArcGisGeometryReaderJSON.d.ts.map +1 -0
- package/lib/cjs/tile/map/ImageryProviders/ArcGisGeometryReaderJSON.js +59 -0
- package/lib/cjs/tile/map/ImageryProviders/ArcGisGeometryReaderJSON.js.map +1 -0
- package/lib/cjs/tile/map/ImageryProviders/ArcGisGeometryRenderer.d.ts +44 -0
- package/lib/cjs/tile/map/ImageryProviders/ArcGisGeometryRenderer.d.ts.map +1 -0
- package/lib/cjs/tile/map/ImageryProviders/ArcGisGeometryRenderer.js +126 -0
- package/lib/cjs/tile/map/ImageryProviders/ArcGisGeometryRenderer.js.map +1 -0
- package/lib/cjs/tile/map/ImageryProviders/ArcGisGraphicsRenderer.d.ts +26 -0
- package/lib/cjs/tile/map/ImageryProviders/ArcGisGraphicsRenderer.d.ts.map +1 -0
- package/lib/cjs/tile/map/ImageryProviders/ArcGisGraphicsRenderer.js +134 -0
- package/lib/cjs/tile/map/ImageryProviders/ArcGisGraphicsRenderer.js.map +1 -0
- package/lib/cjs/tile/map/ImageryProviders/WebMercator.d.ts +6 -0
- package/lib/cjs/tile/map/ImageryProviders/WebMercator.d.ts.map +1 -0
- package/lib/cjs/tile/map/ImageryProviders/WebMercator.js +22 -0
- package/lib/cjs/tile/map/ImageryProviders/WebMercator.js.map +1 -0
- package/lib/cjs/tile/map/ImageryTileTree.d.ts +2 -1
- package/lib/cjs/tile/map/ImageryTileTree.d.ts.map +1 -1
- package/lib/cjs/tile/map/ImageryTileTree.js +2 -2
- package/lib/cjs/tile/map/ImageryTileTree.js.map +1 -1
- package/lib/cjs/tile/map/MapFeatureInfo.d.ts +67 -7
- package/lib/cjs/tile/map/MapFeatureInfo.d.ts.map +1 -1
- package/lib/cjs/tile/map/MapFeatureInfo.js +16 -2
- package/lib/cjs/tile/map/MapFeatureInfo.js.map +1 -1
- package/lib/cjs/tile/map/MapLayerImageryProvider.d.ts +4 -1
- package/lib/cjs/tile/map/MapLayerImageryProvider.d.ts.map +1 -1
- package/lib/cjs/tile/map/MapLayerImageryProvider.js +3 -1
- package/lib/cjs/tile/map/MapLayerImageryProvider.js.map +1 -1
- package/lib/cjs/tile/map/MapTile.d.ts.map +1 -1
- package/lib/cjs/tile/map/MapTile.js +9 -1
- package/lib/cjs/tile/map/MapTile.js.map +1 -1
- package/lib/cjs/tile/map/MapTileLoader.d.ts.map +1 -1
- package/lib/cjs/tile/map/MapTileLoader.js +1 -15
- package/lib/cjs/tile/map/MapTileLoader.js.map +1 -1
- package/lib/cjs/tile/map/MapTileTree.d.ts +12 -3
- package/lib/cjs/tile/map/MapTileTree.d.ts.map +1 -1
- package/lib/cjs/tile/map/MapTileTree.js +33 -20
- package/lib/cjs/tile/map/MapTileTree.js.map +1 -1
- package/lib/cjs/tile/map/MapTiledGraphicsProvider.d.ts +2 -3
- package/lib/cjs/tile/map/MapTiledGraphicsProvider.d.ts.map +1 -1
- package/lib/cjs/tile/map/MapTiledGraphicsProvider.js +3 -4
- package/lib/cjs/tile/map/MapTiledGraphicsProvider.js.map +1 -1
- package/lib/esm/BackgroundMapGeometry.d.ts +1 -0
- package/lib/esm/BackgroundMapGeometry.d.ts.map +1 -1
- package/lib/esm/BackgroundMapGeometry.js +29 -0
- package/lib/esm/BackgroundMapGeometry.js.map +1 -1
- package/lib/esm/HitDetail.d.ts.map +1 -1
- package/lib/esm/HitDetail.js +1 -1
- package/lib/esm/HitDetail.js.map +1 -1
- package/lib/esm/IModelConnection.d.ts +22 -4
- package/lib/esm/IModelConnection.d.ts.map +1 -1
- package/lib/esm/IModelConnection.js +32 -8
- package/lib/esm/IModelConnection.js.map +1 -1
- package/lib/esm/Viewport.d.ts +5 -5
- package/lib/esm/Viewport.d.ts.map +1 -1
- package/lib/esm/Viewport.js +6 -6
- package/lib/esm/Viewport.js.map +1 -1
- package/lib/esm/tile/internal.d.ts +4 -0
- package/lib/esm/tile/internal.d.ts.map +1 -1
- package/lib/esm/tile/internal.js +4 -0
- package/lib/esm/tile/internal.js.map +1 -1
- package/lib/esm/tile/map/ImageryProviders/ArcGISImageryProvider.d.ts +2 -0
- package/lib/esm/tile/map/ImageryProviders/ArcGISImageryProvider.d.ts.map +1 -1
- package/lib/esm/tile/map/ImageryProviders/ArcGISImageryProvider.js +2 -0
- package/lib/esm/tile/map/ImageryProviders/ArcGISImageryProvider.js.map +1 -1
- package/lib/esm/tile/map/ImageryProviders/ArcGISMapLayerImageryProvider.d.ts +55 -2
- package/lib/esm/tile/map/ImageryProviders/ArcGISMapLayerImageryProvider.d.ts.map +1 -1
- package/lib/esm/tile/map/ImageryProviders/ArcGISMapLayerImageryProvider.js +96 -24
- package/lib/esm/tile/map/ImageryProviders/ArcGISMapLayerImageryProvider.js.map +1 -1
- package/lib/esm/tile/map/ImageryProviders/ArcGisGeometryReaderJSON.d.ts +15 -0
- package/lib/esm/tile/map/ImageryProviders/ArcGisGeometryReaderJSON.d.ts.map +1 -0
- package/lib/esm/tile/map/ImageryProviders/ArcGisGeometryReaderJSON.js +55 -0
- package/lib/esm/tile/map/ImageryProviders/ArcGisGeometryReaderJSON.js.map +1 -0
- package/lib/esm/tile/map/ImageryProviders/ArcGisGeometryRenderer.d.ts +44 -0
- package/lib/esm/tile/map/ImageryProviders/ArcGisGeometryRenderer.d.ts.map +1 -0
- package/lib/esm/tile/map/ImageryProviders/ArcGisGeometryRenderer.js +122 -0
- package/lib/esm/tile/map/ImageryProviders/ArcGisGeometryRenderer.js.map +1 -0
- package/lib/esm/tile/map/ImageryProviders/ArcGisGraphicsRenderer.d.ts +26 -0
- package/lib/esm/tile/map/ImageryProviders/ArcGisGraphicsRenderer.d.ts.map +1 -0
- package/lib/esm/tile/map/ImageryProviders/ArcGisGraphicsRenderer.js +130 -0
- package/lib/esm/tile/map/ImageryProviders/ArcGisGraphicsRenderer.js.map +1 -0
- package/lib/esm/tile/map/ImageryProviders/WebMercator.d.ts +6 -0
- package/lib/esm/tile/map/ImageryProviders/WebMercator.d.ts.map +1 -0
- package/lib/esm/tile/map/ImageryProviders/WebMercator.js +18 -0
- package/lib/esm/tile/map/ImageryProviders/WebMercator.js.map +1 -0
- package/lib/esm/tile/map/ImageryTileTree.d.ts +2 -1
- package/lib/esm/tile/map/ImageryTileTree.d.ts.map +1 -1
- package/lib/esm/tile/map/ImageryTileTree.js +2 -2
- package/lib/esm/tile/map/ImageryTileTree.js.map +1 -1
- package/lib/esm/tile/map/MapFeatureInfo.d.ts +67 -7
- package/lib/esm/tile/map/MapFeatureInfo.d.ts.map +1 -1
- package/lib/esm/tile/map/MapFeatureInfo.js +14 -1
- package/lib/esm/tile/map/MapFeatureInfo.js.map +1 -1
- package/lib/esm/tile/map/MapLayerImageryProvider.d.ts +4 -1
- package/lib/esm/tile/map/MapLayerImageryProvider.d.ts.map +1 -1
- package/lib/esm/tile/map/MapLayerImageryProvider.js +3 -1
- package/lib/esm/tile/map/MapLayerImageryProvider.js.map +1 -1
- package/lib/esm/tile/map/MapTile.d.ts.map +1 -1
- package/lib/esm/tile/map/MapTile.js +9 -1
- package/lib/esm/tile/map/MapTile.js.map +1 -1
- package/lib/esm/tile/map/MapTileLoader.d.ts.map +1 -1
- package/lib/esm/tile/map/MapTileLoader.js +1 -15
- package/lib/esm/tile/map/MapTileLoader.js.map +1 -1
- package/lib/esm/tile/map/MapTileTree.d.ts +12 -3
- package/lib/esm/tile/map/MapTileTree.d.ts.map +1 -1
- package/lib/esm/tile/map/MapTileTree.js +34 -21
- package/lib/esm/tile/map/MapTileTree.js.map +1 -1
- package/lib/esm/tile/map/MapTiledGraphicsProvider.d.ts +2 -3
- package/lib/esm/tile/map/MapTiledGraphicsProvider.d.ts.map +1 -1
- package/lib/esm/tile/map/MapTiledGraphicsProvider.js +3 -4
- package/lib/esm/tile/map/MapTiledGraphicsProvider.js.map +1 -1
- package/package.json +18 -18
|
@@ -0,0 +1,55 @@
|
|
|
1
|
+
/** @internal */
|
|
2
|
+
export class ArcGisGeometryReaderJSON {
|
|
3
|
+
constructor(geometryType, renderer, relativeCoords = false) {
|
|
4
|
+
this._ringsOrPaths = geometryType === "esriGeometryPolyline" || geometryType === "esriGeometryPolygon";
|
|
5
|
+
this._points = geometryType === "esriGeometryPoint" || geometryType === "esriGeometryMultiPoint";
|
|
6
|
+
this._fill = geometryType === "esriGeometryPolygon";
|
|
7
|
+
this._renderer = renderer;
|
|
8
|
+
this._relativeCoords = relativeCoords;
|
|
9
|
+
}
|
|
10
|
+
async readGeometry(geometry) {
|
|
11
|
+
if (this._ringsOrPaths) {
|
|
12
|
+
await this.readRingsAndPaths(geometry, this._renderer, this._fill, this._relativeCoords);
|
|
13
|
+
}
|
|
14
|
+
else if (this._points) {
|
|
15
|
+
await this.readPoints(geometry, this._renderer, this._relativeCoords);
|
|
16
|
+
}
|
|
17
|
+
}
|
|
18
|
+
async readRingsAndPaths(geometry, renderer, fill, relativeCoords) {
|
|
19
|
+
let offset = 0;
|
|
20
|
+
const lengths = [];
|
|
21
|
+
const coords = [];
|
|
22
|
+
if (geometry?.rings) {
|
|
23
|
+
for (const ring of geometry?.rings) {
|
|
24
|
+
offset = ArcGisGeometryReaderJSON.deflateCoordinates(ring, coords, 2, offset);
|
|
25
|
+
lengths.push(ring.length);
|
|
26
|
+
}
|
|
27
|
+
}
|
|
28
|
+
else if (geometry?.paths) {
|
|
29
|
+
for (const path of geometry?.paths) {
|
|
30
|
+
offset = ArcGisGeometryReaderJSON.deflateCoordinates(path, coords, 2, offset);
|
|
31
|
+
lengths.push(path.length);
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
await renderer.renderPath(lengths, coords, fill, 2, relativeCoords);
|
|
35
|
+
}
|
|
36
|
+
async readPoints(geometry, renderer, relativeCoords) {
|
|
37
|
+
if (geometry) {
|
|
38
|
+
const lengths = [];
|
|
39
|
+
const coords = [geometry.x, geometry.y];
|
|
40
|
+
await renderer.renderPoint(lengths, coords, 2, relativeCoords);
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
// Converts an [[x1,y1], [x2,y2], ...] to [x1,y1,x2,y2, ...]
|
|
44
|
+
// stride is the number of dimensions
|
|
45
|
+
// https://github.com/openlayers/openlayers/blob/7a2f87caca9ddc1912d910f56eb5637445fc11f6/src/ol/geom/flat/deflate.js#L26
|
|
46
|
+
static deflateCoordinates(coordinates, flatCoordinates, stride, offset) {
|
|
47
|
+
for (let i = 0, ii = coordinates.length; i < ii; ++i) {
|
|
48
|
+
const coordinate = coordinates[i];
|
|
49
|
+
for (let j = 0; j < stride; ++j)
|
|
50
|
+
flatCoordinates[offset++] = coordinate[j];
|
|
51
|
+
}
|
|
52
|
+
return offset;
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
//# sourceMappingURL=ArcGisGeometryReaderJSON.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ArcGisGeometryReaderJSON.js","sourceRoot":"","sources":["../../../../../src/tile/map/ImageryProviders/ArcGisGeometryReaderJSON.ts"],"names":[],"mappings":"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","sourcesContent":["/*---------------------------------------------------------------------------------------------\r\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\r\n* See LICENSE.md in the project root for license terms and full copyright notice.\r\n*--------------------------------------------------------------------------------------------*/\r\nimport { ArcGisGeometryRenderer } from \"../../internal\";\r\n\r\n/** @internal */\r\nexport class ArcGisGeometryReaderJSON {\r\n private _ringsOrPaths: boolean;\r\n private _points: boolean;\r\n private _fill: boolean;\r\n private _relativeCoords: boolean;\r\n private _renderer: ArcGisGeometryRenderer;\r\n\r\n public constructor(geometryType: string, renderer: ArcGisGeometryRenderer, relativeCoords = false) {\r\n this._ringsOrPaths = geometryType === \"esriGeometryPolyline\" || geometryType === \"esriGeometryPolygon\";\r\n this._points = geometryType === \"esriGeometryPoint\" || geometryType === \"esriGeometryMultiPoint\";\r\n this._fill = geometryType === \"esriGeometryPolygon\";\r\n this._renderer = renderer;\r\n this._relativeCoords = relativeCoords;\r\n }\r\n\r\n public async readGeometry(geometry: any) {\r\n if (this._ringsOrPaths) {\r\n await this.readRingsAndPaths(geometry, this._renderer, this._fill, this._relativeCoords);\r\n\r\n } else if (this._points) {\r\n await this.readPoints(geometry, this._renderer, this._relativeCoords);\r\n }\r\n }\r\n\r\n private async readRingsAndPaths(geometry: any, renderer: ArcGisGeometryRenderer, fill: boolean, relativeCoords: boolean) {\r\n let offset = 0;\r\n const lengths: number[] = [];\r\n const coords: number[] = [];\r\n\r\n if (geometry?.rings) {\r\n for (const ring of geometry?.rings) {\r\n offset = ArcGisGeometryReaderJSON.deflateCoordinates(ring, coords, 2, offset);\r\n lengths.push(ring.length);\r\n }\r\n } else if (geometry?.paths) {\r\n for (const path of geometry?.paths) {\r\n offset = ArcGisGeometryReaderJSON.deflateCoordinates(path, coords, 2, offset);\r\n lengths.push(path.length);\r\n }\r\n }\r\n await renderer.renderPath(lengths, coords, fill, 2, relativeCoords);\r\n }\r\n\r\n private async readPoints(geometry: any, renderer: ArcGisGeometryRenderer, relativeCoords: boolean) {\r\n if (geometry) {\r\n const lengths: number[] = [];\r\n const coords: number[] = [geometry.x, geometry.y];\r\n await renderer.renderPoint(lengths, coords, 2, relativeCoords);\r\n }\r\n }\r\n\r\n // Converts an [[x1,y1], [x2,y2], ...] to [x1,y1,x2,y2, ...]\r\n // stride is the number of dimensions\r\n // https://github.com/openlayers/openlayers/blob/7a2f87caca9ddc1912d910f56eb5637445fc11f6/src/ol/geom/flat/deflate.js#L26\r\n protected static deflateCoordinates(coordinates: number[][], flatCoordinates: number[], stride: number, offset: number) {\r\n for (let i = 0, ii = coordinates.length; i < ii; ++i) {\r\n const coordinate = coordinates[i];\r\n for (let j = 0; j < stride; ++j)\r\n flatCoordinates[offset++] = coordinate[j];\r\n }\r\n\r\n return offset;\r\n }\r\n}\r\n"]}
|
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
import { Transform } from "@itwin/core-geometry";
|
|
2
|
+
/** Interface defining minimal implementation needed to create an ArcGIS geometry renderer,
|
|
3
|
+
* that will ultimately be called by an [[ArcGisFeatureReader]] implementation.
|
|
4
|
+
* @internal
|
|
5
|
+
*/
|
|
6
|
+
export interface ArcGisGeometryRenderer {
|
|
7
|
+
transform: Transform | undefined;
|
|
8
|
+
renderPath(geometryLengths: number[], geometryCoords: number[], fill: boolean, stride: number, relativeCoords: boolean): Promise<void>;
|
|
9
|
+
renderPoint(geometryLengths: number[], geometryCoords: number[], stride: number, relativeCoords: boolean): Promise<void>;
|
|
10
|
+
}
|
|
11
|
+
/** Internal implementation of [[ArcGisGeometryRenderer]]
|
|
12
|
+
* @internal
|
|
13
|
+
*/
|
|
14
|
+
export declare abstract class ArcGisGeometryBaseRenderer implements ArcGisGeometryRenderer {
|
|
15
|
+
private _transform;
|
|
16
|
+
constructor(world2PixelTransform?: Transform);
|
|
17
|
+
get transform(): Transform | undefined;
|
|
18
|
+
protected abstract beginPath(): void;
|
|
19
|
+
protected abstract closePath(): void;
|
|
20
|
+
protected abstract lineTo(x: number, y: number): void;
|
|
21
|
+
protected abstract moveTo(x: number, y: number): void;
|
|
22
|
+
protected abstract stroke(): Promise<void>;
|
|
23
|
+
protected abstract fill(): Promise<void>;
|
|
24
|
+
protected abstract drawPoint(x: number, y: number): void;
|
|
25
|
+
protected abstract finishPoints(): Promise<void>;
|
|
26
|
+
/**
|
|
27
|
+
* Render a path on the renderer's context.
|
|
28
|
+
* Note: Inputs are designed based on the PBF format, to avoid any data transformation.
|
|
29
|
+
* @param geometryLengths Array be used to determine the start and end of each sub-path / rings. (i.e. [5,5] = two rings of 5 vertices)
|
|
30
|
+
* @param geometryCoords Array that linearly encodes the vertices of each sub-path of a polyline / ring of a polygon
|
|
31
|
+
* @param fill Indicates if the path should be filled or not.
|
|
32
|
+
* @param stride Dimension of each vertices (i.e. 2 or 3. 3 could be X,Y,Z, X,YM) Currently 3rd dimension is ignored.
|
|
33
|
+
*/
|
|
34
|
+
renderPath(geometryLengths: number[], geometryCoords: number[], fill: boolean, stride: number, relativeCoords: boolean): Promise<void>;
|
|
35
|
+
/**
|
|
36
|
+
* Render a point on the renderer's context.
|
|
37
|
+
* Note: Inputs are designed based on the PBF format, to avoid any data transformation.
|
|
38
|
+
* @param geometryLengths Array be used to determine the start and end of each multi-point array, empty for single point.
|
|
39
|
+
* @param geometryCoords Array that linearly encodes vertices.
|
|
40
|
+
* @param stride Dimension of each vertices (i.e. 2 or 3. 3 could be X,Y,Z, X,YM) Currently 3rd dimension is ignored.
|
|
41
|
+
*/
|
|
42
|
+
renderPoint(geometryLengths: number[], geometryCoords: number[], stride: number, relativeCoords: boolean): Promise<void>;
|
|
43
|
+
}
|
|
44
|
+
//# sourceMappingURL=ArcGisGeometryRenderer.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ArcGisGeometryRenderer.d.ts","sourceRoot":"","sources":["../../../../../src/tile/map/ImageryProviders/ArcGisGeometryRenderer.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAEjD;;;GAGG;AACH,MAAM,WAAW,sBAAsB;IACrC,SAAS,EAAE,SAAS,GAAG,SAAS,CAAC;IACjC,UAAU,CAAC,eAAe,EAAE,MAAM,EAAE,EAAE,cAAc,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACvI,WAAW,CAAC,eAAe,EAAE,MAAM,EAAE,EAAE,cAAc,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC1H;AAED;;GAEG;AACH,8BAAsB,0BAA2B,YAAW,sBAAsB;IAChF,OAAO,CAAC,UAAU,CAAwB;gBAE9B,oBAAoB,CAAC,EAAE,SAAS;IAI5C,IAAW,SAAS,0BAA8B;IAElD,SAAS,CAAC,QAAQ,CAAC,SAAS,IAAI,IAAI;IACpC,SAAS,CAAC,QAAQ,CAAC,SAAS,IAAI,IAAI;IACpC,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,IAAI;IACrD,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,IAAI;IACrD,SAAS,CAAC,QAAQ,CAAC,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAC1C,SAAS,CAAC,QAAQ,CAAC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IACxC,SAAS,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,IAAI;IACxD,SAAS,CAAC,QAAQ,CAAC,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IAEhD;;;;;;;MAOE;IACW,UAAU,CAAC,eAAe,EAAE,MAAM,EAAE,EAAE,cAAc,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,OAAO;IAiEnI;;;;;;MAME;IACW,WAAW,CAAC,eAAe,EAAE,MAAM,EAAE,EAAE,cAAc,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,OAAO;CA6CtH"}
|
|
@@ -0,0 +1,122 @@
|
|
|
1
|
+
/** Internal implementation of [[ArcGisGeometryRenderer]]
|
|
2
|
+
* @internal
|
|
3
|
+
*/
|
|
4
|
+
export class ArcGisGeometryBaseRenderer {
|
|
5
|
+
constructor(world2PixelTransform) {
|
|
6
|
+
this._transform = world2PixelTransform;
|
|
7
|
+
}
|
|
8
|
+
get transform() { return this._transform; }
|
|
9
|
+
/**
|
|
10
|
+
* Render a path on the renderer's context.
|
|
11
|
+
* Note: Inputs are designed based on the PBF format, to avoid any data transformation.
|
|
12
|
+
* @param geometryLengths Array be used to determine the start and end of each sub-path / rings. (i.e. [5,5] = two rings of 5 vertices)
|
|
13
|
+
* @param geometryCoords Array that linearly encodes the vertices of each sub-path of a polyline / ring of a polygon
|
|
14
|
+
* @param fill Indicates if the path should be filled or not.
|
|
15
|
+
* @param stride Dimension of each vertices (i.e. 2 or 3. 3 could be X,Y,Z, X,YM) Currently 3rd dimension is ignored.
|
|
16
|
+
*/
|
|
17
|
+
async renderPath(geometryLengths, geometryCoords, fill, stride, relativeCoords) {
|
|
18
|
+
if (stride < 2 || stride > 3) {
|
|
19
|
+
return;
|
|
20
|
+
}
|
|
21
|
+
// Keep track of our position in the in the 'coords' array:
|
|
22
|
+
// Every time we loop on the 'lengths' array, the position
|
|
23
|
+
// to start reading vertices in the 'coords' must be the sum of all previously read vertices.
|
|
24
|
+
let coordsOffset = 0;
|
|
25
|
+
// Begin the path here.
|
|
26
|
+
// Note: Even though path is closed inside the 'geometryLengths' loop,
|
|
27
|
+
// it's import to begin the path only once.
|
|
28
|
+
this.beginPath();
|
|
29
|
+
for (const vertexCount of geometryLengths) {
|
|
30
|
+
let lastPtX = 0, lastPtY = 0;
|
|
31
|
+
for (let vertexIdx = 0; vertexIdx < vertexCount; vertexIdx++) {
|
|
32
|
+
let pX = geometryCoords[coordsOffset + (vertexIdx * stride)];
|
|
33
|
+
let pY = geometryCoords[coordsOffset + (vertexIdx * stride) + 1];
|
|
34
|
+
if (vertexIdx === 0) {
|
|
35
|
+
// first vertex is always "absolute" and must be drawn as 'moveTo' (i.e. not lineTo)
|
|
36
|
+
if (relativeCoords) {
|
|
37
|
+
lastPtX = pX;
|
|
38
|
+
lastPtY = pY;
|
|
39
|
+
}
|
|
40
|
+
if (this._transform) {
|
|
41
|
+
const transformedPoint = this._transform.multiplyPoint2d({ x: pX, y: pY });
|
|
42
|
+
pX = transformedPoint.x;
|
|
43
|
+
pY = transformedPoint.y;
|
|
44
|
+
}
|
|
45
|
+
this.moveTo(pX, pY);
|
|
46
|
+
}
|
|
47
|
+
else {
|
|
48
|
+
// Following vertices are relative to the previous one (sadly not really well documented by ESRI)
|
|
49
|
+
// typically this happens when 'coordinates quantization' is active (i.e. no client side transformation is needed)
|
|
50
|
+
if (relativeCoords) {
|
|
51
|
+
pX = lastPtX = lastPtX + pX;
|
|
52
|
+
pY = lastPtY = lastPtY + pY;
|
|
53
|
+
}
|
|
54
|
+
if (this._transform) {
|
|
55
|
+
const transformedPoint = this._transform.multiplyPoint2d({ x: pX, y: pY });
|
|
56
|
+
pX = transformedPoint.x;
|
|
57
|
+
pY = transformedPoint.y;
|
|
58
|
+
}
|
|
59
|
+
this.lineTo(pX, pY);
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
coordsOffset += stride * vertexCount;
|
|
63
|
+
if (fill) {
|
|
64
|
+
// ClosePath but do not 'fill' here, only at the very end (otherwise it will mess up holes)
|
|
65
|
+
this.closePath();
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
if (fill) {
|
|
69
|
+
await this.fill();
|
|
70
|
+
}
|
|
71
|
+
await this.stroke(); // draw line path or polygon outline
|
|
72
|
+
}
|
|
73
|
+
/**
|
|
74
|
+
* Render a point on the renderer's context.
|
|
75
|
+
* Note: Inputs are designed based on the PBF format, to avoid any data transformation.
|
|
76
|
+
* @param geometryLengths Array be used to determine the start and end of each multi-point array, empty for single point.
|
|
77
|
+
* @param geometryCoords Array that linearly encodes vertices.
|
|
78
|
+
* @param stride Dimension of each vertices (i.e. 2 or 3. 3 could be X,Y,Z, X,YM) Currently 3rd dimension is ignored.
|
|
79
|
+
*/
|
|
80
|
+
async renderPoint(geometryLengths, geometryCoords, stride, relativeCoords) {
|
|
81
|
+
if (stride < 2 || stride > 3) {
|
|
82
|
+
return;
|
|
83
|
+
}
|
|
84
|
+
let coordsOffset = 0;
|
|
85
|
+
if (geometryLengths.length === 0) {
|
|
86
|
+
// Strangely, for points, 'lengths' array is empty, so we assume there is a single vertex in 'coords' array.
|
|
87
|
+
if (geometryCoords.length >= stride) {
|
|
88
|
+
if (this._transform) {
|
|
89
|
+
const transformedPoint = this._transform.multiplyPoint2d({ x: geometryCoords[0], y: geometryCoords[1] });
|
|
90
|
+
this.drawPoint(transformedPoint.x, transformedPoint.y);
|
|
91
|
+
}
|
|
92
|
+
else {
|
|
93
|
+
this.drawPoint(geometryCoords[0], geometryCoords[1]);
|
|
94
|
+
}
|
|
95
|
+
}
|
|
96
|
+
}
|
|
97
|
+
else {
|
|
98
|
+
// MULTI-POINTS: Needs testing
|
|
99
|
+
// I assume 'lengths' array will get populated and 'coords' array will look similar to line/polygons.
|
|
100
|
+
for (const vertexCount of geometryLengths) {
|
|
101
|
+
let lastPtX = 0, lastPtY = 0;
|
|
102
|
+
for (let vertexIdx = 0; vertexIdx < vertexCount; vertexIdx++) {
|
|
103
|
+
let pX = geometryCoords[coordsOffset + (vertexIdx * stride)];
|
|
104
|
+
let pY = geometryCoords[coordsOffset + (vertexIdx * stride) + 1];
|
|
105
|
+
if (relativeCoords) {
|
|
106
|
+
pX = lastPtX = lastPtX + pX;
|
|
107
|
+
pY = lastPtY = lastPtY + pY;
|
|
108
|
+
}
|
|
109
|
+
if (this._transform) {
|
|
110
|
+
const transformedPoint = this._transform.multiplyPoint2d({ x: pX, y: pY });
|
|
111
|
+
pX = transformedPoint.x;
|
|
112
|
+
pY = transformedPoint.y;
|
|
113
|
+
}
|
|
114
|
+
this.drawPoint(pX, pY);
|
|
115
|
+
}
|
|
116
|
+
coordsOffset += stride * vertexCount;
|
|
117
|
+
}
|
|
118
|
+
}
|
|
119
|
+
await this.finishPoints();
|
|
120
|
+
}
|
|
121
|
+
}
|
|
122
|
+
//# sourceMappingURL=ArcGisGeometryRenderer.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ArcGisGeometryRenderer.js","sourceRoot":"","sources":["../../../../../src/tile/map/ImageryProviders/ArcGisGeometryRenderer.ts"],"names":[],"mappings":"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","sourcesContent":["/*---------------------------------------------------------------------------------------------\r\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\r\n* See LICENSE.md in the project root for license terms and full copyright notice.\r\n*--------------------------------------------------------------------------------------------*/\r\nimport { Transform } from \"@itwin/core-geometry\";\r\n\r\n/** Interface defining minimal implementation needed to create an ArcGIS geometry renderer,\r\n * that will ultimately be called by an [[ArcGisFeatureReader]] implementation.\r\n * @internal\r\n */\r\nexport interface ArcGisGeometryRenderer {\r\n transform: Transform | undefined;\r\n renderPath(geometryLengths: number[], geometryCoords: number[], fill: boolean, stride: number, relativeCoords: boolean): Promise<void>;\r\n renderPoint(geometryLengths: number[], geometryCoords: number[], stride: number, relativeCoords: boolean): Promise<void>;\r\n}\r\n\r\n/** Internal implementation of [[ArcGisGeometryRenderer]]\r\n * @internal\r\n */\r\nexport abstract class ArcGisGeometryBaseRenderer implements ArcGisGeometryRenderer {\r\n private _transform: Transform | undefined;\r\n\r\n constructor(world2PixelTransform?: Transform) {\r\n this._transform = world2PixelTransform;\r\n }\r\n\r\n public get transform() { return this._transform; }\r\n\r\n protected abstract beginPath(): void;\r\n protected abstract closePath(): void;\r\n protected abstract lineTo(x: number, y: number): void;\r\n protected abstract moveTo(x: number, y: number): void;\r\n protected abstract stroke(): Promise<void>;\r\n protected abstract fill(): Promise<void>;\r\n protected abstract drawPoint(x: number, y: number): void;\r\n protected abstract finishPoints(): Promise<void>;\r\n\r\n /**\r\n * Render a path on the renderer's context.\r\n * Note: Inputs are designed based on the PBF format, to avoid any data transformation.\r\n * @param geometryLengths Array be used to determine the start and end of each sub-path / rings. (i.e. [5,5] = two rings of 5 vertices)\r\n * @param geometryCoords Array that linearly encodes the vertices of each sub-path of a polyline / ring of a polygon\r\n * @param fill Indicates if the path should be filled or not.\r\n * @param stride Dimension of each vertices (i.e. 2 or 3. 3 could be X,Y,Z, X,YM) Currently 3rd dimension is ignored.\r\n */\r\n public async renderPath(geometryLengths: number[], geometryCoords: number[], fill: boolean, stride: number, relativeCoords: boolean) {\r\n if (stride < 2 || stride > 3) {\r\n return;\r\n }\r\n\r\n // Keep track of our position in the in the 'coords' array:\r\n // Every time we loop on the 'lengths' array, the position\r\n // to start reading vertices in the 'coords' must be the sum of all previously read vertices.\r\n let coordsOffset = 0;\r\n\r\n // Begin the path here.\r\n // Note: Even though path is closed inside the 'geometryLengths' loop,\r\n // it's import to begin the path only once.\r\n this.beginPath();\r\n for (const vertexCount of geometryLengths) {\r\n let lastPtX = 0, lastPtY = 0;\r\n for (let vertexIdx = 0; vertexIdx < vertexCount; vertexIdx++) {\r\n let pX = geometryCoords[coordsOffset + (vertexIdx * stride)];\r\n let pY = geometryCoords[coordsOffset + (vertexIdx * stride) + 1];\r\n if (vertexIdx === 0) {\r\n // first vertex is always \"absolute\" and must be drawn as 'moveTo' (i.e. not lineTo)\r\n if (relativeCoords) {\r\n lastPtX = pX;\r\n lastPtY = pY;\r\n }\r\n\r\n if (this._transform) {\r\n const transformedPoint = this._transform.multiplyPoint2d({ x: pX, y: pY });\r\n pX = transformedPoint.x;\r\n pY = transformedPoint.y;\r\n }\r\n\r\n this.moveTo(pX, pY);\r\n } else {\r\n\r\n // Following vertices are relative to the previous one (sadly not really well documented by ESRI)\r\n // typically this happens when 'coordinates quantization' is active (i.e. no client side transformation is needed)\r\n if (relativeCoords) {\r\n pX = lastPtX = lastPtX + pX;\r\n pY = lastPtY = lastPtY + pY;\r\n }\r\n\r\n if (this._transform) {\r\n const transformedPoint = this._transform.multiplyPoint2d({ x: pX, y: pY });\r\n pX = transformedPoint.x;\r\n pY = transformedPoint.y;\r\n }\r\n this.lineTo(pX, pY);\r\n }\r\n\r\n }\r\n coordsOffset += stride * vertexCount;\r\n if (fill) {\r\n // ClosePath but do not 'fill' here, only at the very end (otherwise it will mess up holes)\r\n this.closePath();\r\n }\r\n }\r\n\r\n if (fill) {\r\n await this.fill();\r\n }\r\n\r\n await this.stroke(); // draw line path or polygon outline\r\n }\r\n\r\n /**\r\n * Render a point on the renderer's context.\r\n * Note: Inputs are designed based on the PBF format, to avoid any data transformation.\r\n * @param geometryLengths Array be used to determine the start and end of each multi-point array, empty for single point.\r\n * @param geometryCoords Array that linearly encodes vertices.\r\n * @param stride Dimension of each vertices (i.e. 2 or 3. 3 could be X,Y,Z, X,YM) Currently 3rd dimension is ignored.\r\n */\r\n public async renderPoint(geometryLengths: number[], geometryCoords: number[], stride: number, relativeCoords: boolean) {\r\n\r\n if (stride < 2 || stride > 3) {\r\n return;\r\n }\r\n let coordsOffset = 0;\r\n if (geometryLengths.length === 0) {\r\n // Strangely, for points, 'lengths' array is empty, so we assume there is a single vertex in 'coords' array.\r\n if (geometryCoords.length >= stride) {\r\n\r\n if (this._transform) {\r\n const transformedPoint = this._transform.multiplyPoint2d({ x: geometryCoords[0], y: geometryCoords[1] });\r\n this.drawPoint(transformedPoint.x, transformedPoint.y);\r\n } else {\r\n this.drawPoint(geometryCoords[0], geometryCoords[1]);\r\n }\r\n }\r\n } else {\r\n // MULTI-POINTS: Needs testing\r\n // I assume 'lengths' array will get populated and 'coords' array will look similar to line/polygons.\r\n for (const vertexCount of geometryLengths) {\r\n let lastPtX = 0, lastPtY = 0;\r\n for (let vertexIdx = 0; vertexIdx < vertexCount; vertexIdx++) {\r\n let pX = geometryCoords[coordsOffset + (vertexIdx * stride)];\r\n let pY = geometryCoords[coordsOffset + (vertexIdx * stride) + 1];\r\n\r\n if (relativeCoords) {\r\n pX = lastPtX = lastPtX + pX;\r\n pY = lastPtY = lastPtY + pY;\r\n }\r\n\r\n if (this._transform) {\r\n const transformedPoint = this._transform.multiplyPoint2d({ x: pX, y: pY });\r\n pX = transformedPoint.x;\r\n pY = transformedPoint.y;\r\n }\r\n\r\n this.drawPoint(pX, pY);\r\n\r\n }\r\n coordsOffset += stride * vertexCount;\r\n }\r\n }\r\n await this.finishPoints();\r\n }\r\n}\r\n\r\n"]}
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
import { ArcGisGeometryBaseRenderer } from "../../internal";
|
|
2
|
+
import { GraphicPrimitive } from "../../../render/GraphicPrimitive";
|
|
3
|
+
import { IModelConnection } from "../../../IModelConnection";
|
|
4
|
+
/** ArcGIS geometry renderer implementation that will "render" a list of [GraphicPrimitive]($frontend)
|
|
5
|
+
* This renderer initial objective is to read geometries when a call to [[MapLayerImageryProvider.getFeatureInfo]] is performed.
|
|
6
|
+
* @internal
|
|
7
|
+
*/
|
|
8
|
+
export declare class ArcGisGraphicsRenderer extends ArcGisGeometryBaseRenderer {
|
|
9
|
+
private _scratchPointsArray;
|
|
10
|
+
private _scratchPaths;
|
|
11
|
+
private _graphics;
|
|
12
|
+
private _iModel;
|
|
13
|
+
constructor(iModel: IModelConnection);
|
|
14
|
+
moveGraphics(): GraphicPrimitive[];
|
|
15
|
+
protected beginPath(): void;
|
|
16
|
+
protected closePath(): void;
|
|
17
|
+
protected lineTo(x: number, y: number): Promise<void>;
|
|
18
|
+
protected moveTo(x: number, y: number): Promise<void>;
|
|
19
|
+
protected fill(): Promise<void>;
|
|
20
|
+
protected stroke(): Promise<void>;
|
|
21
|
+
protected drawPoint(x: number, y: number): void;
|
|
22
|
+
protected finishPoints(): Promise<void>;
|
|
23
|
+
private toSpatialFromGcs;
|
|
24
|
+
private toSpatialFromEcf;
|
|
25
|
+
}
|
|
26
|
+
//# sourceMappingURL=ArcGisGraphicsRenderer.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ArcGisGraphicsRenderer.d.ts","sourceRoot":"","sources":["../../../../../src/tile/map/ImageryProviders/ArcGisGraphicsRenderer.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,0BAA0B,EAAe,MAAM,gBAAgB,CAAC;AACzE,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AACpE,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAI7D;;;GAGG;AACH,qBAAa,sBAAuB,SAAQ,0BAA0B;IACpE,OAAO,CAAC,mBAAmB,CAA0B;IACrD,OAAO,CAAC,aAAa,CAAmB;IACxC,OAAO,CAAC,SAAS,CAA0B;IAC3C,OAAO,CAAC,OAAO,CAAmB;gBAEtB,MAAM,EAAE,gBAAgB;IAK7B,YAAY;IAMnB,SAAS,CAAC,SAAS;IAKnB,SAAS,CAAC,SAAS;cAOH,MAAM,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM;cAI3B,MAAM,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM;cAU3B,IAAI;cA8BJ,MAAM;cAyBH,SAAS,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,IAAI;cAI/B,YAAY;YAmBvB,gBAAgB;IAI9B,OAAO,CAAC,gBAAgB;CAQzB"}
|
|
@@ -0,0 +1,130 @@
|
|
|
1
|
+
/*---------------------------------------------------------------------------------------------
|
|
2
|
+
* Copyright (c) Bentley Systems, Incorporated. All rights reserved.
|
|
3
|
+
* See LICENSE.md in the project root for license terms and full copyright notice.
|
|
4
|
+
*--------------------------------------------------------------------------------------------*/
|
|
5
|
+
import { Logger } from "@itwin/core-bentley";
|
|
6
|
+
import { Cartographic } from "@itwin/core-common";
|
|
7
|
+
import { GrowableXYZArray, LineString3d, Loop, Point3dArray, RegionOps } from "@itwin/core-geometry";
|
|
8
|
+
import { ArcGisGeometryBaseRenderer, WebMercator } from "../../internal";
|
|
9
|
+
const loggerCategory = "MapLayerImageryProvider.ArcGisGraphicsRenderer";
|
|
10
|
+
/** ArcGIS geometry renderer implementation that will "render" a list of [GraphicPrimitive]($frontend)
|
|
11
|
+
* This renderer initial objective is to read geometries when a call to [[MapLayerImageryProvider.getFeatureInfo]] is performed.
|
|
12
|
+
* @internal
|
|
13
|
+
*/
|
|
14
|
+
export class ArcGisGraphicsRenderer extends ArcGisGeometryBaseRenderer {
|
|
15
|
+
constructor(iModel) {
|
|
16
|
+
super();
|
|
17
|
+
this._scratchPointsArray = new GrowableXYZArray();
|
|
18
|
+
this._scratchPaths = [];
|
|
19
|
+
this._graphics = [];
|
|
20
|
+
this._iModel = iModel;
|
|
21
|
+
}
|
|
22
|
+
moveGraphics() {
|
|
23
|
+
const graphics = this._graphics;
|
|
24
|
+
this._graphics = [];
|
|
25
|
+
return graphics;
|
|
26
|
+
}
|
|
27
|
+
beginPath() {
|
|
28
|
+
this._scratchPointsArray.clear();
|
|
29
|
+
this._scratchPaths = [];
|
|
30
|
+
}
|
|
31
|
+
closePath() {
|
|
32
|
+
if (this._scratchPointsArray.length > 0) {
|
|
33
|
+
this._scratchPaths.push(this._scratchPointsArray.getArray());
|
|
34
|
+
this._scratchPointsArray.clear();
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
async lineTo(x, y) {
|
|
38
|
+
this._scratchPointsArray.push({ x, y, z: 0 });
|
|
39
|
+
}
|
|
40
|
+
async moveTo(x, y) {
|
|
41
|
+
if (this._scratchPointsArray.length > 0) {
|
|
42
|
+
this._scratchPaths.push(this._scratchPointsArray.getArray());
|
|
43
|
+
this._scratchPointsArray.clear();
|
|
44
|
+
}
|
|
45
|
+
this._scratchPointsArray.push({ x, y, z: 0 });
|
|
46
|
+
}
|
|
47
|
+
async fill() {
|
|
48
|
+
if (this._scratchPaths.length > 0) {
|
|
49
|
+
const loops = [];
|
|
50
|
+
if (this._iModel.noGcsDefined) {
|
|
51
|
+
for (const points of this._scratchPaths) {
|
|
52
|
+
loops.push(Loop.create(LineString3d.create(this.toSpatialFromEcf(points))));
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
else {
|
|
56
|
+
const pathPromises = [];
|
|
57
|
+
for (const points of this._scratchPaths) {
|
|
58
|
+
pathPromises.push(this.toSpatialFromGcs(points));
|
|
59
|
+
}
|
|
60
|
+
const pathsArray = await Promise.all(pathPromises);
|
|
61
|
+
for (const pointsArray of pathsArray) {
|
|
62
|
+
loops.push(Loop.create(LineString3d.create(pointsArray)));
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
const mergedLoops = RegionOps.constructAllXYRegionLoops(loops);
|
|
66
|
+
for (const loop of mergedLoops) {
|
|
67
|
+
for (const negativeLoop of loop.negativeAreaLoops) {
|
|
68
|
+
this._graphics.push({ type: "loop", loop: negativeLoop });
|
|
69
|
+
}
|
|
70
|
+
}
|
|
71
|
+
this._scratchPaths = [];
|
|
72
|
+
}
|
|
73
|
+
}
|
|
74
|
+
async stroke() {
|
|
75
|
+
if (this._scratchPointsArray.length > 0) {
|
|
76
|
+
this._scratchPaths.push(this._scratchPointsArray.getArray());
|
|
77
|
+
this._scratchPointsArray.clear();
|
|
78
|
+
}
|
|
79
|
+
if (this._iModel.noGcsDefined) {
|
|
80
|
+
for (const linestring of this._scratchPaths) {
|
|
81
|
+
this._graphics.push({ type: "linestring", points: this.toSpatialFromEcf(linestring) });
|
|
82
|
+
}
|
|
83
|
+
}
|
|
84
|
+
else {
|
|
85
|
+
const pathPromises = [];
|
|
86
|
+
for (const noGcsDefined of this._scratchPaths) {
|
|
87
|
+
pathPromises.push(this.toSpatialFromGcs(noGcsDefined));
|
|
88
|
+
}
|
|
89
|
+
const reprojectedPaths = await Promise.all(pathPromises);
|
|
90
|
+
for (const path of reprojectedPaths) {
|
|
91
|
+
this._graphics.push({ type: "linestring", points: Point3dArray.clonePoint3dArray(path) });
|
|
92
|
+
}
|
|
93
|
+
}
|
|
94
|
+
this._scratchPaths = [];
|
|
95
|
+
}
|
|
96
|
+
drawPoint(x, y) {
|
|
97
|
+
this._scratchPointsArray.push({ x, y, z: 0 });
|
|
98
|
+
}
|
|
99
|
+
async finishPoints() {
|
|
100
|
+
if (this._scratchPointsArray.length > 0) {
|
|
101
|
+
if (this._iModel.noGcsDefined) {
|
|
102
|
+
this._graphics.push({ type: "pointstring", points: this.toSpatialFromEcf(this._scratchPointsArray.getArray()) });
|
|
103
|
+
}
|
|
104
|
+
else {
|
|
105
|
+
// Backend reprojection
|
|
106
|
+
const pointsArray = this._scratchPointsArray.getArray();
|
|
107
|
+
try {
|
|
108
|
+
const spatialPoints = await this.toSpatialFromGcs(pointsArray);
|
|
109
|
+
this._graphics.push({ type: "pointstring", points: spatialPoints });
|
|
110
|
+
}
|
|
111
|
+
catch (error) {
|
|
112
|
+
Logger.logError(loggerCategory, "ArcGisFeatureGraphicsRenderer: Could not reproject points");
|
|
113
|
+
}
|
|
114
|
+
}
|
|
115
|
+
this._scratchPointsArray.clear();
|
|
116
|
+
}
|
|
117
|
+
}
|
|
118
|
+
async toSpatialFromGcs(geoPoints) {
|
|
119
|
+
return this._iModel.toSpatialFromGcs(geoPoints, { horizontalCRS: { epsg: 3857 }, verticalCRS: { id: "ELLIPSOID" } });
|
|
120
|
+
}
|
|
121
|
+
toSpatialFromEcf(geoPoints) {
|
|
122
|
+
const spatials = [];
|
|
123
|
+
for (const pt of geoPoints) {
|
|
124
|
+
const carto = { longitude: WebMercator.getEPSG4326Lon(pt.x), latitude: WebMercator.getEPSG4326Lat(pt.y), height: pt.z };
|
|
125
|
+
spatials.push(this._iModel.cartographicToSpatialFromEcef(Cartographic.fromDegrees(carto)));
|
|
126
|
+
}
|
|
127
|
+
return spatials;
|
|
128
|
+
}
|
|
129
|
+
}
|
|
130
|
+
//# sourceMappingURL=ArcGisGraphicsRenderer.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ArcGisGraphicsRenderer.js","sourceRoot":"","sources":["../../../../../src/tile/map/ImageryProviders/ArcGisGraphicsRenderer.ts"],"names":[],"mappings":"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","sourcesContent":["/*---------------------------------------------------------------------------------------------\r\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\r\n* See LICENSE.md in the project root for license terms and full copyright notice.\r\n*--------------------------------------------------------------------------------------------*/\r\nimport { Logger } from \"@itwin/core-bentley\";\r\nimport { Cartographic } from \"@itwin/core-common\";\r\nimport { GrowableXYZArray, LineString3d, Loop, Point3d, Point3dArray, RegionOps } from \"@itwin/core-geometry\";\r\nimport { ArcGisGeometryBaseRenderer, WebMercator } from \"../../internal\";\r\nimport { GraphicPrimitive } from \"../../../render/GraphicPrimitive\";\r\nimport { IModelConnection } from \"../../../IModelConnection\";\r\n\r\nconst loggerCategory = \"MapLayerImageryProvider.ArcGisGraphicsRenderer\";\r\n\r\n/** ArcGIS geometry renderer implementation that will \"render\" a list of [GraphicPrimitive]($frontend)\r\n * This renderer initial objective is to read geometries when a call to [[MapLayerImageryProvider.getFeatureInfo]] is performed.\r\n * @internal\r\n */\r\nexport class ArcGisGraphicsRenderer extends ArcGisGeometryBaseRenderer {\r\n private _scratchPointsArray = new GrowableXYZArray();\r\n private _scratchPaths: Point3d[][] = [];\r\n private _graphics: GraphicPrimitive[] = [];\r\n private _iModel: IModelConnection;\r\n\r\n constructor(iModel: IModelConnection) {\r\n super();\r\n this._iModel = iModel;\r\n }\r\n\r\n public moveGraphics() {\r\n const graphics = this._graphics;\r\n this._graphics = [];\r\n return graphics;\r\n }\r\n\r\n protected beginPath() {\r\n this._scratchPointsArray.clear();\r\n this._scratchPaths = [];\r\n }\r\n\r\n protected closePath() {\r\n if (this._scratchPointsArray.length > 0) {\r\n this._scratchPaths.push(this._scratchPointsArray.getArray());\r\n this._scratchPointsArray.clear();\r\n }\r\n }\r\n\r\n protected async lineTo(x: number, y: number) {\r\n this._scratchPointsArray.push({ x, y, z: 0 });\r\n }\r\n\r\n protected async moveTo(x: number, y: number) {\r\n\r\n if (this._scratchPointsArray.length > 0) {\r\n this._scratchPaths.push(this._scratchPointsArray.getArray());\r\n this._scratchPointsArray.clear();\r\n }\r\n\r\n this._scratchPointsArray.push({ x, y, z: 0 });\r\n }\r\n\r\n protected async fill() {\r\n if (this._scratchPaths.length > 0) {\r\n const loops = [];\r\n if (this._iModel.noGcsDefined) {\r\n for (const points of this._scratchPaths) {\r\n loops.push(Loop.create(LineString3d.create(this.toSpatialFromEcf(points))));\r\n }\r\n } else {\r\n const pathPromises = [];\r\n for (const points of this._scratchPaths) {\r\n pathPromises.push(this.toSpatialFromGcs(points));\r\n }\r\n\r\n const pathsArray = await Promise.all(pathPromises);\r\n for (const pointsArray of pathsArray) {\r\n loops.push(Loop.create(LineString3d.create(pointsArray)));\r\n }\r\n }\r\n\r\n const mergedLoops = RegionOps.constructAllXYRegionLoops(loops);\r\n for (const loop of mergedLoops) {\r\n for (const negativeLoop of loop.negativeAreaLoops) {\r\n this._graphics.push({ type: \"loop\", loop: negativeLoop });\r\n }\r\n }\r\n\r\n this._scratchPaths = [];\r\n }\r\n }\r\n\r\n protected async stroke() {\r\n\r\n if (this._scratchPointsArray.length > 0) {\r\n this._scratchPaths.push(this._scratchPointsArray.getArray());\r\n this._scratchPointsArray.clear();\r\n }\r\n\r\n if (this._iModel.noGcsDefined) {\r\n for (const linestring of this._scratchPaths) {\r\n this._graphics.push({ type: \"linestring\", points: this.toSpatialFromEcf(linestring) });\r\n }\r\n } else {\r\n const pathPromises = [];\r\n for (const noGcsDefined of this._scratchPaths) {\r\n pathPromises.push(this.toSpatialFromGcs(noGcsDefined));\r\n }\r\n\r\n const reprojectedPaths = await Promise.all(pathPromises);\r\n for (const path of reprojectedPaths) {\r\n this._graphics.push({ type: \"linestring\", points: Point3dArray.clonePoint3dArray(path) });\r\n }\r\n }\r\n this._scratchPaths = [];\r\n }\r\n\r\n protected override drawPoint(x: number, y: number): void {\r\n this._scratchPointsArray.push({ x, y, z: 0 });\r\n }\r\n\r\n protected override async finishPoints() {\r\n if (this._scratchPointsArray.length > 0) {\r\n\r\n if (this._iModel.noGcsDefined) {\r\n this._graphics.push({ type: \"pointstring\", points: this.toSpatialFromEcf(this._scratchPointsArray.getArray()) });\r\n } else {\r\n // Backend reprojection\r\n const pointsArray = this._scratchPointsArray.getArray();\r\n try {\r\n const spatialPoints = await this.toSpatialFromGcs(pointsArray);\r\n this._graphics.push({ type: \"pointstring\", points: spatialPoints });\r\n } catch (error) {\r\n Logger.logError(loggerCategory, \"ArcGisFeatureGraphicsRenderer: Could not reproject points\");\r\n }\r\n }\r\n this._scratchPointsArray.clear();\r\n }\r\n }\r\n\r\n private async toSpatialFromGcs(geoPoints: Point3d[]) {\r\n return this._iModel.toSpatialFromGcs(geoPoints, { horizontalCRS: { epsg: 3857 }, verticalCRS: { id: \"ELLIPSOID\" } });\r\n }\r\n\r\n private toSpatialFromEcf(geoPoints: Point3d[]) {\r\n const spatials = [];\r\n for (const pt of geoPoints) {\r\n const carto = { longitude: WebMercator.getEPSG4326Lon(pt.x), latitude: WebMercator.getEPSG4326Lat(pt.y), height: pt.z };\r\n spatials.push(this._iModel.cartographicToSpatialFromEcef(Cartographic.fromDegrees(carto)));\r\n }\r\n return spatials;\r\n }\r\n}\r\n"]}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"WebMercator.d.ts","sourceRoot":"","sources":["../../../../../src/tile/map/ImageryProviders/WebMercator.ts"],"names":[],"mappings":"AAOA,gBAAgB;AAChB,qBAAa,WAAW;WAGR,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;WAKrC,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;CAIpD"}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
/*---------------------------------------------------------------------------------------------
|
|
2
|
+
* Copyright (c) Bentley Systems, Incorporated. All rights reserved.
|
|
3
|
+
* See LICENSE.md in the project root for license terms and full copyright notice.
|
|
4
|
+
*--------------------------------------------------------------------------------------------*/
|
|
5
|
+
import { Angle, Constant } from "@itwin/core-geometry";
|
|
6
|
+
/** @internal */
|
|
7
|
+
export class WebMercator {
|
|
8
|
+
// calculates the longitude in EPSG:4326 (WGS84) from the projected x cartesian coordinate in EPSG:3857
|
|
9
|
+
static getEPSG4326Lon(x3857) {
|
|
10
|
+
return Angle.radiansToDegrees(x3857 / Constant.earthRadiusWGS84.equator);
|
|
11
|
+
}
|
|
12
|
+
// calculates the latitude in EPSG:4326 (WGS84) from the projected y cartesian coordinate in EPSG:3857
|
|
13
|
+
static getEPSG4326Lat(y3857) {
|
|
14
|
+
const y = 2 * Math.atan(Math.exp(y3857 / Constant.earthRadiusWGS84.equator)) - (Math.PI / 2);
|
|
15
|
+
return Angle.radiansToDegrees(y);
|
|
16
|
+
}
|
|
17
|
+
}
|
|
18
|
+
//# sourceMappingURL=WebMercator.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"WebMercator.js","sourceRoot":"","sources":["../../../../../src/tile/map/ImageryProviders/WebMercator.ts"],"names":[],"mappings":"AAAA;;;+FAG+F;AAE/F,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAEvD,gBAAgB;AAChB,MAAM,OAAO,WAAW;IAEtB,uGAAuG;IAChG,MAAM,CAAC,cAAc,CAAC,KAAa;QACxC,OAAO,KAAK,CAAC,gBAAgB,CAAC,KAAK,GAAC,QAAQ,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;IACzE,CAAC;IAED,sGAAsG;IAC/F,MAAM,CAAC,cAAc,CAAC,KAAa;QACxC,MAAM,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,GAAG,QAAQ,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,GAAC,CAAC,CAAC,CAAC;QAC3F,OAAO,KAAK,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC;IACnC,CAAC;CACF","sourcesContent":["/*---------------------------------------------------------------------------------------------\r\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\r\n* See LICENSE.md in the project root for license terms and full copyright notice.\r\n*--------------------------------------------------------------------------------------------*/\r\n\r\nimport { Angle, Constant } from \"@itwin/core-geometry\";\r\n\r\n/** @internal */\r\nexport class WebMercator {\r\n\r\n // calculates the longitude in EPSG:4326 (WGS84) from the projected x cartesian coordinate in EPSG:3857\r\n public static getEPSG4326Lon(x3857: number): number {\r\n return Angle.radiansToDegrees(x3857/Constant.earthRadiusWGS84.equator);\r\n }\r\n\r\n // calculates the latitude in EPSG:4326 (WGS84) from the projected y cartesian coordinate in EPSG:3857\r\n public static getEPSG4326Lat(y3857: number): number {\r\n const y = 2 * Math.atan(Math.exp(y3857 / Constant.earthRadiusWGS84.equator)) - (Math.PI/2);\r\n return Angle.radiansToDegrees(y);\r\n }\r\n}\r\n"]}
|
|
@@ -7,6 +7,7 @@ import { RenderMemory } from "../../render/RenderMemory";
|
|
|
7
7
|
import { RenderSystem } from "../../render/RenderSystem";
|
|
8
8
|
import { ScreenViewport } from "../../Viewport";
|
|
9
9
|
import { MapCartoRectangle, MapLayerFeatureInfo, MapLayerImageryProvider, MapLayerTileTreeReference, MapTile, MapTileTreeScaleRangeVisibility, MapTilingScheme, QuadId, RealityTile, RealityTileLoader, RealityTileTree, RealityTileTreeParams, Tile, TileContent, TileDrawArgs, TileLoadPriority, TileParams, TileRequest, TileTreeLoadStatus, TileTreeOwner } from "../internal";
|
|
10
|
+
import { HitDetail } from "../../HitDetail";
|
|
10
11
|
/** @internal */
|
|
11
12
|
export interface ImageryTileContent extends TileContent {
|
|
12
13
|
imageryTexture?: RenderTexture;
|
|
@@ -91,7 +92,7 @@ declare class ImageryTileLoader extends RealityTileLoader {
|
|
|
91
92
|
get maximumScreenSize(): number;
|
|
92
93
|
get imageryProvider(): MapLayerImageryProvider;
|
|
93
94
|
getToolTip(strings: string[], quadId: QuadId, carto: Cartographic, tree: ImageryMapTileTree): Promise<void>;
|
|
94
|
-
getMapFeatureInfo(featureInfos: MapLayerFeatureInfo[], quadId: QuadId, carto: Cartographic, tree: ImageryMapTileTree): Promise<void>;
|
|
95
|
+
getMapFeatureInfo(featureInfos: MapLayerFeatureInfo[], quadId: QuadId, carto: Cartographic, tree: ImageryMapTileTree, hit: HitDetail): Promise<void>;
|
|
95
96
|
generateChildIds(tile: ImageryMapTile, resolveChildren: (childIds: QuadId[]) => void): void;
|
|
96
97
|
/** Load this tile's children, possibly asynchronously. Pass them to `resolve`, or an error to `reject`. */
|
|
97
98
|
loadChildren(_tile: RealityTile): Promise<Tile[] | undefined>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ImageryTileTree.d.ts","sourceRoot":"","sources":["../../../../src/tile/map/ImageryTileTree.ts"],"names":[],"mappings":"AAIA;;GAEG;AAIH,OAAO,EAAE,YAAY,EAAsC,gBAAgB,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAE1I,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,EACL,iBAAiB,EAAE,mBAAmB,EAAE,uBAAuB,EAAE,yBAAyB,EAAE,OAAO,EAAE,+BAA+B,EAAE,eAAe,EAAE,MAAM,EAAE,WAAW,EAAE,iBAAiB,EAAE,eAAe,EAC9M,qBAAqB,EAAE,IAAI,EAAE,WAAW,EAAE,YAAY,EAAE,gBAAgB,EAAE,UAAU,EAAE,WAAW,EAAY,kBAAkB,EAAE,aAAa,EAE/I,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"ImageryTileTree.d.ts","sourceRoot":"","sources":["../../../../src/tile/map/ImageryTileTree.ts"],"names":[],"mappings":"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"}
|
|
@@ -224,8 +224,8 @@ class ImageryTileLoader extends RealityTileLoader {
|
|
|
224
224
|
get maximumScreenSize() { return this._imageryProvider.maximumScreenSize; }
|
|
225
225
|
get imageryProvider() { return this._imageryProvider; }
|
|
226
226
|
async getToolTip(strings, quadId, carto, tree) { await this._imageryProvider.getToolTip(strings, quadId, carto, tree); }
|
|
227
|
-
async getMapFeatureInfo(featureInfos, quadId, carto, tree) {
|
|
228
|
-
await this._imageryProvider.getFeatureInfo(featureInfos, quadId, carto, tree);
|
|
227
|
+
async getMapFeatureInfo(featureInfos, quadId, carto, tree, hit) {
|
|
228
|
+
await this._imageryProvider.getFeatureInfo(featureInfos, quadId, carto, tree, hit);
|
|
229
229
|
}
|
|
230
230
|
generateChildIds(tile, resolveChildren) { return this._imageryProvider.generateChildIds(tile, resolveChildren); }
|
|
231
231
|
/** Load this tile's children, possibly asynchronously. Pass them to `resolve`, or an error to `reject`. */
|