@loaders.gl/arcgis 5.0.0-alpha.9 → 5.0.0-beta.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/LICENSE +2 -30
- package/README.md +47 -15
- package/THIRD-PARTY-NOTICES.md +19 -0
- package/dist/arcgis/arcgis-capability-graph.d.ts +1 -1
- package/dist/arcgis/arcgis-capability-graph.d.ts.map +1 -1
- package/dist/arcgis/{arcgis-feature-server-source-loader-types.d.ts → arcgis-feature-server-loader-types.d.ts} +8 -8
- package/dist/arcgis/arcgis-feature-server-loader-types.d.ts.map +1 -0
- package/dist/arcgis/arcgis-feature-server-loader-types.js +21 -0
- package/dist/arcgis/arcgis-feature-server-loader-types.js.map +1 -0
- package/dist/arcgis/{arcgis-feature-server-source-loader.d.ts → arcgis-feature-server-loader.d.ts} +9 -9
- package/dist/arcgis/arcgis-feature-server-loader.d.ts.map +1 -0
- package/dist/arcgis/{arcgis-feature-server-source-loader.js → arcgis-feature-server-loader.js} +7 -6
- package/dist/arcgis/arcgis-feature-server-loader.js.map +1 -0
- package/dist/arcgis/{arcgis-image-server-source-loader-types.d.ts → arcgis-image-server-loader-types.d.ts} +8 -8
- package/dist/arcgis/arcgis-image-server-loader-types.d.ts.map +1 -0
- package/dist/arcgis/arcgis-image-server-loader-types.js +21 -0
- package/dist/arcgis/arcgis-image-server-loader-types.js.map +1 -0
- package/dist/arcgis/{arcgis-image-server-source-loader.d.ts → arcgis-image-server-loader.d.ts} +11 -12
- package/dist/arcgis/arcgis-image-server-loader.d.ts.map +1 -0
- package/dist/arcgis/{arcgis-image-server-source-loader.js → arcgis-image-server-loader.js} +5 -5
- package/dist/arcgis/arcgis-image-server-loader.js.map +1 -0
- package/dist/arcgis/{arcgis-image-tile-source-loader-types.d.ts → arcgis-image-tile-loader-types.d.ts} +8 -8
- package/dist/arcgis/arcgis-image-tile-loader-types.d.ts.map +1 -0
- package/dist/arcgis/arcgis-image-tile-loader-types.js +21 -0
- package/dist/arcgis/arcgis-image-tile-loader-types.js.map +1 -0
- package/dist/arcgis/{arcgis-image-tile-source-loader.d.ts → arcgis-image-tile-loader.d.ts} +11 -12
- package/dist/arcgis/arcgis-image-tile-loader.d.ts.map +1 -0
- package/dist/arcgis/{arcgis-image-tile-source-loader.js → arcgis-image-tile-loader.js} +10 -6
- package/dist/arcgis/arcgis-image-tile-loader.js.map +1 -0
- package/dist/arcgis/{arcgis-map-tile-source-loader-types.d.ts → arcgis-map-tile-loader-types.d.ts} +8 -8
- package/dist/arcgis/arcgis-map-tile-loader-types.d.ts.map +1 -0
- package/dist/arcgis/arcgis-map-tile-loader-types.js +21 -0
- package/dist/arcgis/arcgis-map-tile-loader-types.js.map +1 -0
- package/dist/arcgis/{arcgis-map-tile-source-loader.d.ts → arcgis-map-tile-loader.d.ts} +10 -11
- package/dist/arcgis/arcgis-map-tile-loader.d.ts.map +1 -0
- package/dist/arcgis/{arcgis-map-tile-source-loader.js → arcgis-map-tile-loader.js} +18 -22
- package/dist/arcgis/arcgis-map-tile-loader.js.map +1 -0
- package/dist/arcgis/{arcgis-scene-server-source-loader-types.d.ts → arcgis-scene-server-loader-types.d.ts} +8 -8
- package/dist/arcgis/arcgis-scene-server-loader-types.d.ts.map +1 -0
- package/dist/arcgis/arcgis-scene-server-loader-types.js +21 -0
- package/dist/arcgis/arcgis-scene-server-loader-types.js.map +1 -0
- package/dist/arcgis/{arcgis-scene-server-source-loader.d.ts → arcgis-scene-server-loader.d.ts} +9 -9
- package/dist/arcgis/arcgis-scene-server-loader.d.ts.map +1 -0
- package/dist/arcgis/{arcgis-scene-server-source-loader.js → arcgis-scene-server-loader.js} +5 -5
- package/dist/arcgis/arcgis-scene-server-loader.js.map +1 -0
- package/dist/arcgis/arcgis-tile-grid.d.ts +5 -0
- package/dist/arcgis/arcgis-tile-grid.d.ts.map +1 -0
- package/dist/arcgis/arcgis-tile-grid.js +43 -0
- package/dist/arcgis/arcgis-tile-grid.js.map +1 -0
- package/dist/arcgis/{arcgis-vector-tile-server-source-loader-types.d.ts → arcgis-vector-tile-server-loader-types.d.ts} +8 -8
- package/dist/arcgis/arcgis-vector-tile-server-loader-types.d.ts.map +1 -0
- package/dist/arcgis/arcgis-vector-tile-server-loader-types.js +21 -0
- package/dist/arcgis/arcgis-vector-tile-server-loader-types.js.map +1 -0
- package/dist/arcgis/{arcgis-vector-tile-server-source-loader.d.ts → arcgis-vector-tile-server-loader.d.ts} +11 -9
- package/dist/arcgis/arcgis-vector-tile-server-loader.d.ts.map +1 -0
- package/dist/arcgis/{arcgis-vector-tile-server-source-loader.js → arcgis-vector-tile-server-loader.js} +23 -9
- package/dist/arcgis/arcgis-vector-tile-server-loader.js.map +1 -0
- package/dist/arcgis-feature-query-types.d.ts +2 -2
- package/dist/arcgis-feature-query-types.d.ts.map +1 -1
- package/dist/arcgis-feature-server-loader.d.ts +2 -0
- package/dist/arcgis-feature-server-loader.d.ts.map +1 -0
- package/dist/arcgis-feature-server-loader.js +2 -0
- package/dist/arcgis-feature-server-loader.js.map +1 -0
- package/dist/arcgis-image-server-loader.d.ts +2 -0
- package/dist/arcgis-image-server-loader.d.ts.map +1 -0
- package/dist/arcgis-image-server-loader.js +2 -0
- package/dist/arcgis-image-server-loader.js.map +1 -0
- package/dist/arcgis-image-tile-loader.d.ts +2 -0
- package/dist/arcgis-image-tile-loader.d.ts.map +1 -0
- package/dist/arcgis-image-tile-loader.js +2 -0
- package/dist/arcgis-image-tile-loader.js.map +1 -0
- package/dist/arcgis-items.d.ts +64 -0
- package/dist/arcgis-items.d.ts.map +1 -0
- package/dist/arcgis-items.js +137 -0
- package/dist/arcgis-items.js.map +1 -0
- package/dist/arcgis-map-tile-loader.d.ts +2 -0
- package/dist/arcgis-map-tile-loader.d.ts.map +1 -0
- package/dist/arcgis-map-tile-loader.js +2 -0
- package/dist/arcgis-map-tile-loader.js.map +1 -0
- package/dist/arcgis-scene-server-loader.d.ts +2 -0
- package/dist/arcgis-scene-server-loader.d.ts.map +1 -0
- package/dist/arcgis-scene-server-loader.js +2 -0
- package/dist/arcgis-scene-server-loader.js.map +1 -0
- package/dist/arcgis-source-types.d.ts +20 -14
- package/dist/arcgis-source-types.d.ts.map +1 -1
- package/dist/arcgis-source-types.js +6 -6
- package/dist/arcgis-source-types.js.map +1 -1
- package/dist/arcgis-vector-tile-server-loader.d.ts +2 -0
- package/dist/arcgis-vector-tile-server-loader.d.ts.map +1 -0
- package/dist/arcgis-vector-tile-server-loader.js +2 -0
- package/dist/arcgis-vector-tile-server-loader.js.map +1 -0
- package/dist/authentication.d.ts +9 -3
- package/dist/authentication.d.ts.map +1 -1
- package/dist/authentication.js +79 -9
- package/dist/authentication.js.map +1 -1
- package/dist/bundled.d.ts +20 -19
- package/dist/bundled.d.ts.map +1 -1
- package/dist/bundled.js +19 -18
- package/dist/bundled.js.map +1 -1
- package/dist/index.cjs +15247 -17467
- package/dist/index.cjs.map +3 -3
- package/dist/index.d.ts +14 -13
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +6 -6
- package/dist/index.js.map +1 -1
- package/dist/service-registry.d.ts +7 -7
- package/dist/service-registry.d.ts.map +1 -1
- package/dist/service-registry.js +12 -12
- package/dist/service-registry.js.map +1 -1
- package/package.json +40 -30
- package/src/arcgis/arcgis-capability-graph.ts +1 -1
- package/src/arcgis/arcgis-feature-query.ts +1 -1
- package/src/arcgis/arcgis-feature-server-loader-types.ts +34 -0
- package/src/arcgis/{arcgis-feature-server-source-loader.ts → arcgis-feature-server-loader.ts} +13 -15
- package/src/arcgis/arcgis-image-server-loader-types.ts +34 -0
- package/src/arcgis/{arcgis-image-server-source-loader.ts → arcgis-image-server-loader.ts} +13 -14
- package/src/arcgis/arcgis-image-tile-loader-types.ts +34 -0
- package/src/arcgis/{arcgis-image-tile-source-loader.ts → arcgis-image-tile-loader.ts} +23 -19
- package/src/arcgis/arcgis-map-tile-loader-types.ts +32 -0
- package/src/arcgis/{arcgis-map-tile-source-loader.ts → arcgis-map-tile-loader.ts} +33 -31
- package/src/arcgis/{arcgis-scene-server-source-loader-types.ts → arcgis-scene-server-loader-types.ts} +12 -12
- package/src/arcgis/{arcgis-scene-server-source-loader.ts → arcgis-scene-server-loader.ts} +10 -10
- package/src/arcgis/arcgis-tile-grid.ts +55 -0
- package/src/arcgis/{arcgis-vector-tile-server-source-loader-types.ts → arcgis-vector-tile-server-loader-types.ts} +12 -12
- package/src/arcgis/{arcgis-vector-tile-server-source-loader.ts → arcgis-vector-tile-server-loader.ts} +33 -18
- package/src/arcgis-feature-query-types.ts +2 -2
- package/src/arcgis-feature-server-loader.ts +1 -0
- package/src/arcgis-image-server-loader.ts +1 -0
- package/src/arcgis-image-tile-loader.ts +1 -0
- package/src/arcgis-items.ts +233 -0
- package/src/arcgis-map-tile-loader.ts +1 -0
- package/src/arcgis-scene-server-loader.ts +1 -0
- package/src/arcgis-source-types.ts +24 -16
- package/src/arcgis-vector-tile-server-loader.ts +1 -0
- package/src/authentication.ts +93 -10
- package/src/bundled.ts +59 -25
- package/src/index.ts +25 -18
- package/src/service-registry.ts +18 -18
- package/dist/arcgis/arcgis-feature-server-source-loader-types.d.ts.map +0 -1
- package/dist/arcgis/arcgis-feature-server-source-loader-types.js +0 -21
- package/dist/arcgis/arcgis-feature-server-source-loader-types.js.map +0 -1
- package/dist/arcgis/arcgis-feature-server-source-loader.d.ts.map +0 -1
- package/dist/arcgis/arcgis-feature-server-source-loader.js.map +0 -1
- package/dist/arcgis/arcgis-image-server-source-loader-types.d.ts.map +0 -1
- package/dist/arcgis/arcgis-image-server-source-loader-types.js +0 -21
- package/dist/arcgis/arcgis-image-server-source-loader-types.js.map +0 -1
- package/dist/arcgis/arcgis-image-server-source-loader.d.ts.map +0 -1
- package/dist/arcgis/arcgis-image-server-source-loader.js.map +0 -1
- package/dist/arcgis/arcgis-image-tile-source-loader-types.d.ts.map +0 -1
- package/dist/arcgis/arcgis-image-tile-source-loader-types.js +0 -21
- package/dist/arcgis/arcgis-image-tile-source-loader-types.js.map +0 -1
- package/dist/arcgis/arcgis-image-tile-source-loader.d.ts.map +0 -1
- package/dist/arcgis/arcgis-image-tile-source-loader.js.map +0 -1
- package/dist/arcgis/arcgis-map-tile-source-loader-types.d.ts.map +0 -1
- package/dist/arcgis/arcgis-map-tile-source-loader-types.js +0 -21
- package/dist/arcgis/arcgis-map-tile-source-loader-types.js.map +0 -1
- package/dist/arcgis/arcgis-map-tile-source-loader.d.ts.map +0 -1
- package/dist/arcgis/arcgis-map-tile-source-loader.js.map +0 -1
- package/dist/arcgis/arcgis-scene-server-source-loader-types.d.ts.map +0 -1
- package/dist/arcgis/arcgis-scene-server-source-loader-types.js +0 -21
- package/dist/arcgis/arcgis-scene-server-source-loader-types.js.map +0 -1
- package/dist/arcgis/arcgis-scene-server-source-loader.d.ts.map +0 -1
- package/dist/arcgis/arcgis-scene-server-source-loader.js.map +0 -1
- package/dist/arcgis/arcgis-vector-tile-server-source-loader-types.d.ts.map +0 -1
- package/dist/arcgis/arcgis-vector-tile-server-source-loader-types.js +0 -21
- package/dist/arcgis/arcgis-vector-tile-server-source-loader-types.js.map +0 -1
- package/dist/arcgis/arcgis-vector-tile-server-source-loader.d.ts.map +0 -1
- package/dist/arcgis/arcgis-vector-tile-server-source-loader.js.map +0 -1
- package/src/arcgis/arcgis-feature-server-source-loader-types.ts +0 -34
- package/src/arcgis/arcgis-image-server-source-loader-types.ts +0 -34
- package/src/arcgis/arcgis-image-tile-source-loader-types.ts +0 -34
- package/src/arcgis/arcgis-map-tile-source-loader-types.ts +0 -34
|
@@ -4,9 +4,8 @@
|
|
|
4
4
|
|
|
5
5
|
import {ArcGISAuthentication} from '../authentication';
|
|
6
6
|
import {ARCGIS_IMAGE_TILE_SOURCE_LOADER_METADATA} from '../arcgis-source-types';
|
|
7
|
-
import type {
|
|
7
|
+
import type {ArcGISImageTileLoaderOptions} from '../arcgis-source-types';
|
|
8
8
|
|
|
9
|
-
import type {ImageType} from '@loaders.gl/images';
|
|
10
9
|
import {ImageLoader} from '@loaders.gl/images';
|
|
11
10
|
import type {
|
|
12
11
|
CoreAPI,
|
|
@@ -15,14 +14,14 @@ import type {
|
|
|
15
14
|
SourceLoader,
|
|
16
15
|
TileSource,
|
|
17
16
|
TileSourceMetadata
|
|
18
|
-
} from '@loaders.gl/loader-utils';
|
|
19
|
-
import {DataSource} from '@loaders.gl/loader-utils';
|
|
20
|
-
import type {LERCData} from '@loaders.gl/
|
|
21
|
-
import {LERCLoader} from '@loaders.gl/
|
|
17
|
+
} from '@loaders.gl/core/loader-utils';
|
|
18
|
+
import {DataSource} from '@loaders.gl/core/loader-utils';
|
|
19
|
+
import type {LERCData} from '@loaders.gl/raster';
|
|
20
|
+
import {LERCLoader} from '@loaders.gl/raster';
|
|
22
21
|
|
|
23
22
|
/** A tile source that renders ArcGIS ImageServer exports as deck.gl tiles. */
|
|
24
23
|
export class ArcGISImageTileSource
|
|
25
|
-
extends DataSource<string,
|
|
24
|
+
extends DataSource<string, ArcGISImageTileLoaderOptions>
|
|
26
25
|
implements TileSource
|
|
27
26
|
{
|
|
28
27
|
/** MIME type represented by the tile response. */
|
|
@@ -36,7 +35,7 @@ export class ArcGISImageTileSource
|
|
|
36
35
|
private _runtimeParameters: Record<string, string | number | boolean> = {};
|
|
37
36
|
|
|
38
37
|
/** Creates an ArcGIS ImageServer tile source. */
|
|
39
|
-
constructor(url: string, options:
|
|
38
|
+
constructor(url: string, options: ArcGISImageTileLoaderOptions = {}, coreApi?: CoreAPI) {
|
|
40
39
|
super(
|
|
41
40
|
url.replace(/\/$/, ''),
|
|
42
41
|
options,
|
|
@@ -75,7 +74,8 @@ export class ArcGISImageTileSource
|
|
|
75
74
|
async getTile(
|
|
76
75
|
parameters: GetTileParameters,
|
|
77
76
|
signal?: AbortSignal
|
|
78
|
-
): Promise<
|
|
77
|
+
): Promise<ImageBitmap | LERCData | null> {
|
|
78
|
+
signal ||= parameters.signal;
|
|
79
79
|
const response = await this.fetch(this.getTileURL(parameters), signal ? {signal} : undefined);
|
|
80
80
|
if (!response.ok) {
|
|
81
81
|
throw new Error(
|
|
@@ -83,16 +83,17 @@ export class ArcGISImageTileSource
|
|
|
83
83
|
);
|
|
84
84
|
}
|
|
85
85
|
const loader = this._getResponseFormat() === 'lerc' ? LERCLoader : ImageLoader;
|
|
86
|
-
return (await this.coreApi.parse(
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
this.loadOptions
|
|
90
|
-
)) as ImageType;
|
|
86
|
+
return (await this.coreApi.parse(await response.arrayBuffer(), loader, this.loadOptions)) as
|
|
87
|
+
| ImageBitmap
|
|
88
|
+
| LERCData;
|
|
91
89
|
}
|
|
92
90
|
|
|
93
91
|
/** Fetches a tile using the deck.gl-compatible request shape. */
|
|
94
|
-
async getTileData(parameters: GetTileDataParameters): Promise<
|
|
95
|
-
return this.getTile(
|
|
92
|
+
async getTileData(parameters: GetTileDataParameters): Promise<ImageBitmap | LERCData | null> {
|
|
93
|
+
return this.getTile(
|
|
94
|
+
{...parameters.index, tileMatrix: parameters.tileMatrix, signal: parameters.signal},
|
|
95
|
+
parameters.signal
|
|
96
|
+
);
|
|
96
97
|
}
|
|
97
98
|
|
|
98
99
|
/** Updates parameters applied to subsequent ImageServer export requests. */
|
|
@@ -102,6 +103,9 @@ export class ArcGISImageTileSource
|
|
|
102
103
|
|
|
103
104
|
/** Builds an ImageServer exportImage URL for one web-mercator tile. */
|
|
104
105
|
getTileURL(parameters: GetTileParameters, tileSize?: number): string {
|
|
106
|
+
if (parameters.tileMatrix !== undefined && parameters.tileMatrix !== String(parameters.z)) {
|
|
107
|
+
throw new Error('ArcGIS ImageServer export requires a matching XYZ zoom');
|
|
108
|
+
}
|
|
105
109
|
const options = this.options['arcgis-image-server-tiles'] || {};
|
|
106
110
|
const resolvedTileSize = tileSize || options.tileSize || 256;
|
|
107
111
|
const [west, south, east, north] = getWebMercatorTileBounds(parameters);
|
|
@@ -165,16 +169,16 @@ export class ArcGISImageTileSource
|
|
|
165
169
|
}
|
|
166
170
|
|
|
167
171
|
/** Runtime service loader for synchronous construction. */
|
|
168
|
-
export const
|
|
172
|
+
export const ArcGISImageTileLoaderWithParser = {
|
|
169
173
|
...ARCGIS_IMAGE_TILE_SOURCE_LOADER_METADATA,
|
|
170
174
|
dataType: null as unknown as ArcGISImageTileSource,
|
|
171
175
|
batchType: null as never,
|
|
172
176
|
preload: undefined,
|
|
173
177
|
/** Supplies ArcGIS credentials after loading the selected implementation. */
|
|
174
178
|
getAuthentications: () => [ArcGISAuthentication],
|
|
175
|
-
|
|
179
|
+
createDataSourceSync: (
|
|
176
180
|
url: string,
|
|
177
|
-
options:
|
|
181
|
+
options: ArcGISImageTileLoaderOptions = {},
|
|
178
182
|
coreApi?: CoreAPI
|
|
179
183
|
) => new ArcGISImageTileSource(url, options, coreApi)
|
|
180
184
|
} as const satisfies SourceLoader<ArcGISImageTileSource>;
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
// loaders.gl
|
|
2
|
+
// SPDX-License-Identifier: MIT
|
|
3
|
+
// Copyright (c) vis.gl contributors
|
|
4
|
+
|
|
5
|
+
import {ARCGIS_MAP_TILE_SOURCE_LOADER_METADATA} from '../arcgis-source-types';
|
|
6
|
+
import type {CoreAPI, SourceLoader} from '@loaders.gl/core/loader-utils';
|
|
7
|
+
import type {ArcGISMapTileSource} from './arcgis-map-tile-loader';
|
|
8
|
+
import type {ArcGISMapTileLoaderOptions} from '../arcgis-source-types';
|
|
9
|
+
|
|
10
|
+
/** Loads the ArcGISMapTileLoader implementation on first asynchronous use. */
|
|
11
|
+
async function preloadArcGISMapTileSourceLoader(): Promise<SourceLoader<ArcGISMapTileSource>> {
|
|
12
|
+
const {ArcGISMapTileLoaderWithParser} = await import('@loaders.gl/arcgis/arcgis-map-tile-loader');
|
|
13
|
+
return ArcGISMapTileLoaderWithParser;
|
|
14
|
+
}
|
|
15
|
+
|
|
16
|
+
/** Lightweight service descriptor; use createDataSource() or the synchronous /bundled entrypoint. */
|
|
17
|
+
export const ArcGISMapTileLoader = {
|
|
18
|
+
...ARCGIS_MAP_TILE_SOURCE_LOADER_METADATA,
|
|
19
|
+
dataType: null as unknown as ArcGISMapTileSource,
|
|
20
|
+
batchType: null as never,
|
|
21
|
+
preload: preloadArcGISMapTileSourceLoader,
|
|
22
|
+
/** Requires the runtime loader when constructing a source synchronously. */
|
|
23
|
+
createDataSourceSync(
|
|
24
|
+
_url: string,
|
|
25
|
+
_options: ArcGISMapTileLoaderOptions,
|
|
26
|
+
_coreApi?: CoreAPI
|
|
27
|
+
): ArcGISMapTileSource {
|
|
28
|
+
throw new Error(
|
|
29
|
+
'ArcGISMapTileLoader requires async createDataSource() or an @loaders.gl/arcgis/bundled import'
|
|
30
|
+
);
|
|
31
|
+
}
|
|
32
|
+
} as const satisfies SourceLoader<ArcGISMapTileSource>;
|
|
@@ -5,12 +5,11 @@
|
|
|
5
5
|
import {ArcGISAuthentication} from '../authentication';
|
|
6
6
|
import {ARCGIS_MAP_TILE_SOURCE_LOADER_METADATA} from '../arcgis-source-types';
|
|
7
7
|
import type {
|
|
8
|
-
|
|
8
|
+
ArcGISMapTileLoaderOptions,
|
|
9
9
|
ArcGISMapServerMetadata,
|
|
10
10
|
ArcGISMapTileParameters
|
|
11
11
|
} from '../arcgis-source-types';
|
|
12
12
|
|
|
13
|
-
import type {ImageType} from '@loaders.gl/images';
|
|
14
13
|
import {ImageLoader} from '@loaders.gl/images';
|
|
15
14
|
import type {
|
|
16
15
|
CoreAPI,
|
|
@@ -19,12 +18,13 @@ import type {
|
|
|
19
18
|
SourceLoader,
|
|
20
19
|
TileSource,
|
|
21
20
|
TileSourceMetadata
|
|
22
|
-
} from '@loaders.gl/loader-utils';
|
|
23
|
-
import {DataSource} from '@loaders.gl/loader-utils';
|
|
21
|
+
} from '@loaders.gl/core/loader-utils';
|
|
22
|
+
import {DataSource, getTileGridMatrixId} from '@loaders.gl/core/loader-utils';
|
|
23
|
+
import {createArcGISTileGrid} from './arcgis-tile-grid';
|
|
24
24
|
|
|
25
25
|
/** ArcGIS MapServer source for cached `/tile/{z}/{y}/{x}` image tiles. */
|
|
26
26
|
export class ArcGISMapTileSource
|
|
27
|
-
extends DataSource<string,
|
|
27
|
+
extends DataSource<string, ArcGISMapTileLoaderOptions>
|
|
28
28
|
implements TileSource
|
|
29
29
|
{
|
|
30
30
|
/** MIME type rendered by the generic deck.gl tile adapter. */
|
|
@@ -38,7 +38,7 @@ export class ArcGISMapTileSource
|
|
|
38
38
|
private _runtimeParameters: ArcGISMapTileParameters = {};
|
|
39
39
|
|
|
40
40
|
/** Creates an ArcGIS MapServer tile source. */
|
|
41
|
-
constructor(url: string, options:
|
|
41
|
+
constructor(url: string, options: ArcGISMapTileLoaderOptions = {}, coreApi?: CoreAPI) {
|
|
42
42
|
super(
|
|
43
43
|
url.replace(/\/$/, ''),
|
|
44
44
|
options,
|
|
@@ -59,7 +59,9 @@ export class ArcGISMapTileSource
|
|
|
59
59
|
title: metadata.name || '',
|
|
60
60
|
abstract: metadata.description || metadata.serviceDescription || '',
|
|
61
61
|
attributions: metadata.copyrightText ? [metadata.copyrightText] : undefined,
|
|
62
|
-
minZoom:
|
|
62
|
+
minZoom: metadata.tileInfo?.lods?.length
|
|
63
|
+
? Math.min(...metadata.tileInfo.lods.map(level => level.level))
|
|
64
|
+
: 0,
|
|
63
65
|
maxZoom: metadata.tileInfo?.lods?.length
|
|
64
66
|
? Math.max(...metadata.tileInfo.lods.map(lod => lod.level))
|
|
65
67
|
: undefined,
|
|
@@ -74,26 +76,12 @@ export class ArcGISMapTileSource
|
|
|
74
76
|
srs: spatialReferenceWkid ? [`EPSG:${spatialReferenceWkid}`] : [],
|
|
75
77
|
layers: []
|
|
76
78
|
},
|
|
77
|
-
tileGrid: metadata.tileInfo
|
|
78
|
-
? {
|
|
79
|
-
crs: (metadata.tileInfo.spatialReference as {wkid?: number} | undefined)?.wkid
|
|
80
|
-
? `EPSG:${(metadata.tileInfo.spatialReference as {wkid: number}).wkid}`
|
|
81
|
-
: undefined,
|
|
82
|
-
tileSize:
|
|
83
|
-
metadata.tileInfo.rows && metadata.tileInfo.cols
|
|
84
|
-
? [metadata.tileInfo.cols, metadata.tileInfo.rows]
|
|
85
|
-
: undefined,
|
|
86
|
-
origin: metadata.tileInfo.origin
|
|
87
|
-
? [metadata.tileInfo.origin.x, metadata.tileInfo.origin.y]
|
|
88
|
-
: undefined,
|
|
89
|
-
matrixIds: metadata.tileInfo.lods?.map(lod => String(lod.level))
|
|
90
|
-
}
|
|
91
|
-
: undefined
|
|
79
|
+
tileGrid: createArcGISTileGrid(metadata.tileInfo, spatialReference)
|
|
92
80
|
};
|
|
93
81
|
}
|
|
94
82
|
|
|
95
83
|
/** Fetches and decodes one cached ArcGIS tile. */
|
|
96
|
-
async getTile(parameters: GetTileParameters, signal?: AbortSignal): Promise<
|
|
84
|
+
async getTile(parameters: GetTileParameters, signal?: AbortSignal): Promise<ImageBitmap | null> {
|
|
97
85
|
const options = this.options['arcgis-map-server'] || {};
|
|
98
86
|
const mode = options.mode || 'auto';
|
|
99
87
|
const metadata = mode === 'auto' ? await this._getMetadata() : null;
|
|
@@ -111,28 +99,37 @@ export class ArcGISMapTileSource
|
|
|
111
99
|
await response.arrayBuffer(),
|
|
112
100
|
ImageLoader,
|
|
113
101
|
this.loadOptions
|
|
114
|
-
)) as
|
|
102
|
+
)) as ImageBitmap;
|
|
115
103
|
}
|
|
116
104
|
|
|
117
105
|
/** Fetches a tile using the deck.gl-compatible request shape. */
|
|
118
|
-
async getTileData(parameters: GetTileDataParameters): Promise<
|
|
119
|
-
return this.getTile(
|
|
106
|
+
async getTileData(parameters: GetTileDataParameters): Promise<ImageBitmap | null> {
|
|
107
|
+
return this.getTile(
|
|
108
|
+
{...parameters.index, tileMatrix: parameters.tileMatrix, signal: parameters.signal},
|
|
109
|
+
parameters.signal
|
|
110
|
+
);
|
|
120
111
|
}
|
|
121
112
|
|
|
122
113
|
/** Builds the standard ArcGIS cached tile URL. */
|
|
123
114
|
getTileURL(parameters: GetTileParameters): string {
|
|
115
|
+
const metadata = this.options['arcgis-map-server']?.metadata || this._metadata;
|
|
116
|
+
const matrixId = getTileGridMatrixId(
|
|
117
|
+
createArcGISTileGrid(metadata?.tileInfo, metadata?.spatialReference),
|
|
118
|
+
parameters
|
|
119
|
+
);
|
|
124
120
|
const template = this.options['arcgis-map-server']?.urlTemplate;
|
|
125
121
|
if (template) {
|
|
126
122
|
const templateURL = new URL(
|
|
127
123
|
template
|
|
128
|
-
.replaceAll('{z}',
|
|
124
|
+
.replaceAll('{z}', encodeURIComponent(matrixId))
|
|
125
|
+
.replaceAll('{tileMatrix}', encodeURIComponent(matrixId))
|
|
129
126
|
.replaceAll('{y}', String(parameters.y))
|
|
130
127
|
.replaceAll('{x}', String(parameters.x))
|
|
131
128
|
);
|
|
132
129
|
return templateURL.toString();
|
|
133
130
|
}
|
|
134
131
|
const url = new URL(this.getServiceURL(parameters));
|
|
135
|
-
url.pathname = `${url.pathname.replace(/\/$/, '')}/tile/${
|
|
132
|
+
url.pathname = `${url.pathname.replace(/\/$/, '')}/tile/${encodeURIComponent(matrixId)}/${parameters.y}/${parameters.x}`;
|
|
136
133
|
return url.toString();
|
|
137
134
|
}
|
|
138
135
|
|
|
@@ -143,6 +140,11 @@ export class ArcGISMapTileSource
|
|
|
143
140
|
|
|
144
141
|
/** Builds a dynamic MapServer `export` request for one web-mercator tile. */
|
|
145
142
|
getExportTileURL(parameters: GetTileParameters, tileSize?: number): string {
|
|
143
|
+
if (parameters.tileMatrix !== undefined && parameters.tileMatrix !== String(parameters.z)) {
|
|
144
|
+
throw new Error(
|
|
145
|
+
'ArcGIS dynamic export requires a matching XYZ zoom; use cached mode for native matrices'
|
|
146
|
+
);
|
|
147
|
+
}
|
|
146
148
|
const options = this.options['arcgis-map-server'] || {};
|
|
147
149
|
const resolvedTileSize = tileSize || options.tileSize || 256;
|
|
148
150
|
const [west, south, east, north] = getWebMercatorTileBounds(parameters);
|
|
@@ -233,16 +235,16 @@ function getWebMercatorTileBounds(parameters: GetTileParameters): [number, numbe
|
|
|
233
235
|
}
|
|
234
236
|
|
|
235
237
|
/** Runtime service loader for synchronous construction. */
|
|
236
|
-
export const
|
|
238
|
+
export const ArcGISMapTileLoaderWithParser = {
|
|
237
239
|
...ARCGIS_MAP_TILE_SOURCE_LOADER_METADATA,
|
|
238
240
|
dataType: null as unknown as ArcGISMapTileSource,
|
|
239
241
|
batchType: null as never,
|
|
240
242
|
preload: undefined,
|
|
241
243
|
/** Supplies ArcGIS credentials after loading the selected implementation. */
|
|
242
244
|
getAuthentications: () => [ArcGISAuthentication],
|
|
243
|
-
|
|
245
|
+
createDataSourceSync: (
|
|
244
246
|
url: string,
|
|
245
|
-
options:
|
|
247
|
+
options: ArcGISMapTileLoaderOptions = {},
|
|
246
248
|
coreApi?: CoreAPI
|
|
247
249
|
) => new ArcGISMapTileSource(url, options, coreApi)
|
|
248
250
|
} as const satisfies SourceLoader<ArcGISMapTileSource>;
|
|
@@ -3,34 +3,34 @@
|
|
|
3
3
|
// Copyright (c) vis.gl contributors
|
|
4
4
|
|
|
5
5
|
import {ARCGIS_SCENE_SERVER_SOURCE_LOADER_METADATA} from '../arcgis-source-types';
|
|
6
|
-
import type {CoreAPI, SourceLoader} from '@loaders.gl/loader-utils';
|
|
7
|
-
import type {ArcGISSceneServerSource} from './arcgis-scene-server-
|
|
8
|
-
import type {
|
|
6
|
+
import type {CoreAPI, SourceLoader} from '@loaders.gl/core/loader-utils';
|
|
7
|
+
import type {ArcGISSceneServerSource} from './arcgis-scene-server-loader';
|
|
8
|
+
import type {ArcGISSceneServerLoaderOptions} from '../arcgis-source-types';
|
|
9
9
|
|
|
10
|
-
/** Loads the
|
|
10
|
+
/** Loads the ArcGISSceneServerLoader implementation on first asynchronous use. */
|
|
11
11
|
async function preloadArcGISSceneServerSourceLoader(): Promise<
|
|
12
12
|
SourceLoader<ArcGISSceneServerSource>
|
|
13
13
|
> {
|
|
14
|
-
const {
|
|
15
|
-
'@loaders.gl/arcgis/arcgis-scene-server-
|
|
14
|
+
const {ArcGISSceneServerLoaderWithParser} = await import(
|
|
15
|
+
'@loaders.gl/arcgis/arcgis-scene-server-loader'
|
|
16
16
|
);
|
|
17
|
-
return
|
|
17
|
+
return ArcGISSceneServerLoaderWithParser;
|
|
18
18
|
}
|
|
19
19
|
|
|
20
|
-
/** Lightweight service descriptor; use
|
|
21
|
-
export const
|
|
20
|
+
/** Lightweight service descriptor; use createDataSource() or the synchronous /bundled entrypoint. */
|
|
21
|
+
export const ArcGISSceneServerLoader = {
|
|
22
22
|
...ARCGIS_SCENE_SERVER_SOURCE_LOADER_METADATA,
|
|
23
23
|
dataType: null as unknown as ArcGISSceneServerSource,
|
|
24
24
|
batchType: null as never,
|
|
25
25
|
preload: preloadArcGISSceneServerSourceLoader,
|
|
26
26
|
/** Requires the runtime loader when constructing a source synchronously. */
|
|
27
|
-
|
|
27
|
+
createDataSourceSync(
|
|
28
28
|
_url: string,
|
|
29
|
-
_options:
|
|
29
|
+
_options: ArcGISSceneServerLoaderOptions,
|
|
30
30
|
_coreApi?: CoreAPI
|
|
31
31
|
): ArcGISSceneServerSource {
|
|
32
32
|
throw new Error(
|
|
33
|
-
'
|
|
33
|
+
'ArcGISSceneServerLoader requires async createDataSource() or an @loaders.gl/arcgis/bundled import'
|
|
34
34
|
);
|
|
35
35
|
}
|
|
36
36
|
} as const satisfies SourceLoader<ArcGISSceneServerSource>;
|
|
@@ -7,17 +7,17 @@ import {ARCGIS_SCENE_SERVER_SOURCE_LOADER_METADATA} from '../arcgis-source-types
|
|
|
7
7
|
import type {
|
|
8
8
|
ArcGISSceneQueryOptions,
|
|
9
9
|
ArcGISSceneQueryResult,
|
|
10
|
-
|
|
10
|
+
ArcGISSceneServerLoaderOptions
|
|
11
11
|
} from '../arcgis-source-types';
|
|
12
12
|
|
|
13
|
-
import type {CoreAPI, DataSourceOptions, SourceLoader} from '@loaders.gl/loader-utils';
|
|
14
|
-
import {DataSource} from '@loaders.gl/loader-utils';
|
|
13
|
+
import type {CoreAPI, DataSourceOptions, SourceLoader} from '@loaders.gl/core/loader-utils';
|
|
14
|
+
import {DataSource} from '@loaders.gl/core/loader-utils';
|
|
15
15
|
import {
|
|
16
16
|
createI3SLayerSource,
|
|
17
17
|
normalizeI3SServiceMetadata,
|
|
18
18
|
parseI3SSceneLayerMetadata
|
|
19
|
-
} from '@loaders.gl/i3s';
|
|
20
|
-
import type {I3SLayerSource, I3SServiceMetadata, SceneLayer3D} from '@loaders.gl/i3s';
|
|
19
|
+
} from '@loaders.gl/tiles-3d/i3s';
|
|
20
|
+
import type {I3SLayerSource, I3SServiceMetadata, SceneLayer3D} from '@loaders.gl/tiles-3d/i3s';
|
|
21
21
|
import {buildArcGISResourceURL} from './arcgis-url-utils';
|
|
22
22
|
|
|
23
23
|
/** Error raised when a SceneServer query cannot be completed or decoded. */
|
|
@@ -34,14 +34,14 @@ export class ArcGISSceneServerQueryError extends Error {
|
|
|
34
34
|
}
|
|
35
35
|
|
|
36
36
|
/** Source facade for an ArcGIS SceneServer I3S layer. */
|
|
37
|
-
export class ArcGISSceneServerSource extends DataSource<string,
|
|
37
|
+
export class ArcGISSceneServerSource extends DataSource<string, ArcGISSceneServerLoaderOptions> {
|
|
38
38
|
/** Cached normalized layer metadata. */
|
|
39
39
|
private metadataPromise: Promise<I3SServiceMetadata> | null = null;
|
|
40
40
|
/** Cached profile-specific tileset source. */
|
|
41
41
|
private sourcePromise: Promise<I3SLayerSource> | null = null;
|
|
42
42
|
|
|
43
43
|
/** Creates a SceneServer source. */
|
|
44
|
-
constructor(url: string, options:
|
|
44
|
+
constructor(url: string, options: ArcGISSceneServerLoaderOptions = {}, coreApi?: CoreAPI) {
|
|
45
45
|
super(
|
|
46
46
|
trimTrailingSlashes(url),
|
|
47
47
|
options,
|
|
@@ -192,16 +192,16 @@ export class ArcGISSceneServerSource extends DataSource<string, ArcGISSceneServe
|
|
|
192
192
|
}
|
|
193
193
|
|
|
194
194
|
/** Runtime service loader for synchronous construction. */
|
|
195
|
-
export const
|
|
195
|
+
export const ArcGISSceneServerLoaderWithParser = {
|
|
196
196
|
...ARCGIS_SCENE_SERVER_SOURCE_LOADER_METADATA,
|
|
197
197
|
dataType: null as unknown as ArcGISSceneServerSource,
|
|
198
198
|
batchType: null as never,
|
|
199
199
|
preload: undefined,
|
|
200
200
|
/** Supplies ArcGIS credentials after loading the selected implementation. */
|
|
201
201
|
getAuthentications: () => [ArcGISAuthentication],
|
|
202
|
-
|
|
202
|
+
createDataSourceSync: (
|
|
203
203
|
url: string,
|
|
204
|
-
options:
|
|
204
|
+
options: ArcGISSceneServerLoaderOptions = {},
|
|
205
205
|
coreApi?: CoreAPI
|
|
206
206
|
) => new ArcGISSceneServerSource(url, options, coreApi)
|
|
207
207
|
} as const satisfies SourceLoader<ArcGISSceneServerSource>;
|
|
@@ -0,0 +1,55 @@
|
|
|
1
|
+
// loaders.gl
|
|
2
|
+
// SPDX-License-Identifier: MIT
|
|
3
|
+
// Copyright (c) vis.gl contributors
|
|
4
|
+
|
|
5
|
+
import {createTileGrid, createTileGridMatrix} from '@loaders.gl/core/loader-utils';
|
|
6
|
+
import type {TileGrid} from '@loaders.gl/core/loader-utils';
|
|
7
|
+
import type {ArcGISMapServerMetadata} from '../arcgis-source-types';
|
|
8
|
+
|
|
9
|
+
/** Normalizes advertised ArcGIS LODs without inventing dimensions from service coverage. */
|
|
10
|
+
export function createArcGISTileGrid(
|
|
11
|
+
tileInfo: ArcGISMapServerMetadata['tileInfo'],
|
|
12
|
+
spatialReference?: unknown
|
|
13
|
+
): TileGrid | undefined {
|
|
14
|
+
if (!tileInfo) return undefined;
|
|
15
|
+
const reference = (tileInfo.spatialReference || spatialReference) as
|
|
16
|
+
| {wkid?: number; latestWkid?: number; wkt?: string}
|
|
17
|
+
| undefined;
|
|
18
|
+
const identifier = reference?.latestWkid ?? reference?.wkid;
|
|
19
|
+
const crs =
|
|
20
|
+
identifier === 102100 || identifier === 102113
|
|
21
|
+
? 'EPSG:3857'
|
|
22
|
+
: identifier !== undefined
|
|
23
|
+
? `EPSG:${identifier}`
|
|
24
|
+
: reference?.wkt;
|
|
25
|
+
const levels = tileInfo.lods || [];
|
|
26
|
+
if (
|
|
27
|
+
levels.some(level => !Number.isSafeInteger(level.level) || level.level < 0) ||
|
|
28
|
+
new Set(levels.map(level => level.level)).size !== levels.length
|
|
29
|
+
) {
|
|
30
|
+
throw new Error('ArcGIS tile levels require unique nonnegative integer identifiers');
|
|
31
|
+
}
|
|
32
|
+
const matrices = levels.map(level =>
|
|
33
|
+
createTileGridMatrix({
|
|
34
|
+
id: String(level.level),
|
|
35
|
+
resolution: level.resolution,
|
|
36
|
+
point: tileInfo.origin ? [tileInfo.origin.x, tileInfo.origin.y] : undefined,
|
|
37
|
+
swapAxes: false,
|
|
38
|
+
tileWidth: tileInfo.cols,
|
|
39
|
+
tileHeight: tileInfo.rows
|
|
40
|
+
})
|
|
41
|
+
);
|
|
42
|
+
const grid = createTileGrid(crs, matrices);
|
|
43
|
+
// A service may advertise its grid header without any LODs.
|
|
44
|
+
if (!matrices.length) {
|
|
45
|
+
delete grid.matrices;
|
|
46
|
+
delete grid.matrixIds;
|
|
47
|
+
delete grid.matrixSizes;
|
|
48
|
+
grid.origin = tileInfo.origin ? [tileInfo.origin.x, tileInfo.origin.y] : undefined;
|
|
49
|
+
grid.tileSize =
|
|
50
|
+
tileInfo.cols !== undefined && tileInfo.rows !== undefined
|
|
51
|
+
? [tileInfo.cols, tileInfo.rows]
|
|
52
|
+
: undefined;
|
|
53
|
+
}
|
|
54
|
+
return grid;
|
|
55
|
+
}
|
|
@@ -3,34 +3,34 @@
|
|
|
3
3
|
// Copyright (c) vis.gl contributors
|
|
4
4
|
|
|
5
5
|
import {ARCGIS_VECTOR_TILE_SERVER_SOURCE_LOADER_METADATA} from '../arcgis-source-types';
|
|
6
|
-
import type {CoreAPI, SourceLoader} from '@loaders.gl/loader-utils';
|
|
7
|
-
import type {ArcGISVectorTileServerSource} from './arcgis-vector-tile-server-
|
|
8
|
-
import type {
|
|
6
|
+
import type {CoreAPI, SourceLoader} from '@loaders.gl/core/loader-utils';
|
|
7
|
+
import type {ArcGISVectorTileServerSource} from './arcgis-vector-tile-server-loader';
|
|
8
|
+
import type {ArcGISVectorTileServerLoaderOptions} from '../arcgis-source-types';
|
|
9
9
|
|
|
10
|
-
/** Loads the
|
|
10
|
+
/** Loads the ArcGISVectorTileServerLoader implementation on first asynchronous use. */
|
|
11
11
|
async function preloadArcGISVectorTileServerSourceLoader(): Promise<
|
|
12
12
|
SourceLoader<ArcGISVectorTileServerSource>
|
|
13
13
|
> {
|
|
14
|
-
const {
|
|
15
|
-
'@loaders.gl/arcgis/arcgis-vector-tile-server-
|
|
14
|
+
const {ArcGISVectorTileServerLoaderWithParser} = await import(
|
|
15
|
+
'@loaders.gl/arcgis/arcgis-vector-tile-server-loader'
|
|
16
16
|
);
|
|
17
|
-
return
|
|
17
|
+
return ArcGISVectorTileServerLoaderWithParser;
|
|
18
18
|
}
|
|
19
19
|
|
|
20
|
-
/** Lightweight service descriptor; use
|
|
21
|
-
export const
|
|
20
|
+
/** Lightweight service descriptor; use createDataSource() or the synchronous /bundled entrypoint. */
|
|
21
|
+
export const ArcGISVectorTileServerLoader = {
|
|
22
22
|
...ARCGIS_VECTOR_TILE_SERVER_SOURCE_LOADER_METADATA,
|
|
23
23
|
dataType: null as unknown as ArcGISVectorTileServerSource,
|
|
24
24
|
batchType: null as never,
|
|
25
25
|
preload: preloadArcGISVectorTileServerSourceLoader,
|
|
26
26
|
/** Requires the runtime loader when constructing a source synchronously. */
|
|
27
|
-
|
|
27
|
+
createDataSourceSync(
|
|
28
28
|
_url: string,
|
|
29
|
-
_options:
|
|
29
|
+
_options: ArcGISVectorTileServerLoaderOptions,
|
|
30
30
|
_coreApi?: CoreAPI
|
|
31
31
|
): ArcGISVectorTileServerSource {
|
|
32
32
|
throw new Error(
|
|
33
|
-
'
|
|
33
|
+
'ArcGISVectorTileServerLoader requires async createDataSource() or an @loaders.gl/arcgis/bundled import'
|
|
34
34
|
);
|
|
35
35
|
}
|
|
36
36
|
} as const satisfies SourceLoader<ArcGISVectorTileServerSource>;
|
|
@@ -6,7 +6,7 @@ import {ArcGISAuthentication} from '../authentication';
|
|
|
6
6
|
import {ARCGIS_VECTOR_TILE_SERVER_SOURCE_LOADER_METADATA} from '../arcgis-source-types';
|
|
7
7
|
import type {
|
|
8
8
|
ArcGISVectorTileServiceMetadata,
|
|
9
|
-
|
|
9
|
+
ArcGISVectorTileServerLoaderOptions
|
|
10
10
|
} from '../arcgis-source-types';
|
|
11
11
|
|
|
12
12
|
import type {
|
|
@@ -15,16 +15,18 @@ import type {
|
|
|
15
15
|
GetTileParameters,
|
|
16
16
|
SourceLoader,
|
|
17
17
|
TileSourceMetadata,
|
|
18
|
+
TileGrid,
|
|
18
19
|
VectorTile,
|
|
19
20
|
VectorTileSource
|
|
20
|
-
} from '@loaders.gl/loader-utils';
|
|
21
|
-
import {DataSource} from '@loaders.gl/loader-utils';
|
|
22
|
-
import {
|
|
23
|
-
import type
|
|
21
|
+
} from '@loaders.gl/core/loader-utils';
|
|
22
|
+
import {DataSource, getTileGridMatrixId} from '@loaders.gl/core/loader-utils';
|
|
23
|
+
import {createArcGISTileGrid} from './arcgis-tile-grid';
|
|
24
|
+
import {MVTLoader, type MVTLoaderOptions} from '@loaders.gl/tiles/mvt';
|
|
25
|
+
import type {Schema} from '@loaders.gl/core/schema';
|
|
24
26
|
|
|
25
27
|
/** A source for ArcGIS VectorTileServer metadata and PBF tiles. */
|
|
26
28
|
export class ArcGISVectorTileServerSource
|
|
27
|
-
extends DataSource<string,
|
|
29
|
+
extends DataSource<string, ArcGISVectorTileServerLoaderOptions>
|
|
28
30
|
implements VectorTileSource
|
|
29
31
|
{
|
|
30
32
|
/** Decoded tile family consumed by generic tile renderers. */
|
|
@@ -33,15 +35,13 @@ export class ArcGISVectorTileServerSource
|
|
|
33
35
|
readonly localCoordinates = false;
|
|
34
36
|
/** Cached service metadata request. */
|
|
35
37
|
private serviceMetadata: Promise<ArcGISVectorTileServiceMetadata> | null = null;
|
|
38
|
+
/** Advertised grid, available after metadata loads. */
|
|
39
|
+
private tileGrid: TileGrid | undefined;
|
|
36
40
|
/** Query parameters supplied with the service URL, such as an access token. */
|
|
37
41
|
private readonly serviceQueryParameters: URLSearchParams;
|
|
38
42
|
|
|
39
43
|
/** Creates an ArcGIS VectorTileServer source. */
|
|
40
|
-
constructor(
|
|
41
|
-
url: string,
|
|
42
|
-
options: ArcGISVectorTileServerSourceLoaderOptions = {},
|
|
43
|
-
coreApi?: CoreAPI
|
|
44
|
-
) {
|
|
44
|
+
constructor(url: string, options: ArcGISVectorTileServerLoaderOptions = {}, coreApi?: CoreAPI) {
|
|
45
45
|
const serviceURL = new URL(url);
|
|
46
46
|
serviceURL.pathname = serviceURL.pathname.replace(/\/$/, '');
|
|
47
47
|
super(
|
|
@@ -58,14 +58,16 @@ export class ArcGISVectorTileServerSource
|
|
|
58
58
|
const metadata = await this.getServiceMetadata();
|
|
59
59
|
const tileInfo = metadata.tileInfo;
|
|
60
60
|
const lods = tileInfo?.lods || [];
|
|
61
|
+
this.tileGrid = createArcGISTileGrid(tileInfo);
|
|
61
62
|
const extent = metadata.fullExtent || metadata.initialExtent;
|
|
62
63
|
return {
|
|
63
64
|
name: metadata.mapName || this.url.split('/').pop() || '',
|
|
64
65
|
title: metadata.mapName,
|
|
65
66
|
abstract: metadata.serviceDescription,
|
|
66
67
|
format: 'application/vnd.mapbox-vector-tile',
|
|
67
|
-
minZoom: lods
|
|
68
|
-
maxZoom: lods.
|
|
68
|
+
minZoom: lods.length ? Math.min(...lods.map(level => level.level)) : undefined,
|
|
69
|
+
maxZoom: lods.length ? Math.max(...lods.map(level => level.level)) : undefined,
|
|
70
|
+
tileGrid: this.tileGrid,
|
|
69
71
|
boundingBox: extent
|
|
70
72
|
? [
|
|
71
73
|
[extent.xmin, extent.ymin],
|
|
@@ -102,6 +104,12 @@ export class ArcGISVectorTileServerSource
|
|
|
102
104
|
|
|
103
105
|
/** Fetches and decodes one ArcGIS vector tile to geographic coordinates. */
|
|
104
106
|
async getVectorTile(parameters: GetTileParameters): Promise<VectorTile | null> {
|
|
107
|
+
const matrixId = getTileGridMatrixId(this.tileGrid, parameters);
|
|
108
|
+
if (matrixId !== String(parameters.z)) {
|
|
109
|
+
throw new Error(
|
|
110
|
+
'ArcGIS geographic vector decoding requires a matching XYZ zoom; use getTile for native matrix bytes'
|
|
111
|
+
);
|
|
112
|
+
}
|
|
105
113
|
const arrayBuffer = await this.getTile(parameters, parameters.signal);
|
|
106
114
|
if (!arrayBuffer) {
|
|
107
115
|
return null;
|
|
@@ -123,12 +131,19 @@ export class ArcGISVectorTileServerSource
|
|
|
123
131
|
|
|
124
132
|
/** Provides decoded vector tiles through the deck.gl source interface. */
|
|
125
133
|
async getTileData(parameters: GetTileDataParameters): Promise<VectorTile | null> {
|
|
126
|
-
return this.getVectorTile({
|
|
134
|
+
return this.getVectorTile({
|
|
135
|
+
...parameters.index,
|
|
136
|
+
tileMatrix: parameters.tileMatrix,
|
|
137
|
+
signal: parameters.signal
|
|
138
|
+
});
|
|
127
139
|
}
|
|
128
140
|
|
|
129
141
|
/** Builds the ArcGIS cached vector tile URL. */
|
|
130
142
|
getTileURL(parameters: GetTileParameters): string {
|
|
131
|
-
|
|
143
|
+
const matrixId = getTileGridMatrixId(this.tileGrid, parameters);
|
|
144
|
+
return this.getResourceURL(
|
|
145
|
+
`/tile/${encodeURIComponent(matrixId)}/${parameters.y}/${parameters.x}.pbf`
|
|
146
|
+
);
|
|
132
147
|
}
|
|
133
148
|
|
|
134
149
|
/** Returns the service metadata URL. */
|
|
@@ -170,16 +185,16 @@ export class ArcGISVectorTileServerSource
|
|
|
170
185
|
}
|
|
171
186
|
|
|
172
187
|
/** Runtime service loader for synchronous construction. */
|
|
173
|
-
export const
|
|
188
|
+
export const ArcGISVectorTileServerLoaderWithParser = {
|
|
174
189
|
...ARCGIS_VECTOR_TILE_SERVER_SOURCE_LOADER_METADATA,
|
|
175
190
|
dataType: null as unknown as ArcGISVectorTileServerSource,
|
|
176
191
|
batchType: null as never,
|
|
177
192
|
preload: undefined,
|
|
178
193
|
/** Supplies ArcGIS credentials after loading the selected implementation. */
|
|
179
194
|
getAuthentications: () => [ArcGISAuthentication],
|
|
180
|
-
|
|
195
|
+
createDataSourceSync: (
|
|
181
196
|
url: string,
|
|
182
|
-
options:
|
|
197
|
+
options: ArcGISVectorTileServerLoaderOptions = {},
|
|
183
198
|
coreApi?: CoreAPI
|
|
184
199
|
) => new ArcGISVectorTileServerSource(url, options, coreApi)
|
|
185
200
|
} as const satisfies SourceLoader<ArcGISVectorTileServerSource>;
|
|
@@ -2,8 +2,8 @@
|
|
|
2
2
|
// SPDX-License-Identifier: MIT
|
|
3
3
|
// Copyright (c) vis.gl contributors
|
|
4
4
|
|
|
5
|
-
import type {GeoJSONTable} from '@loaders.gl/schema';
|
|
6
|
-
import type {GetFeaturesParameters} from '@loaders.gl/loader-utils';
|
|
5
|
+
import type {GeoJSONTable} from '@loaders.gl/core/schema';
|
|
6
|
+
import type {GetFeaturesParameters} from '@loaders.gl/core/loader-utils';
|
|
7
7
|
import type {ArcGISFeatureServiceQueryOptions} from './arcgis-source-types';
|
|
8
8
|
|
|
9
9
|
/** Parameters shared by feature, table and MapServer layer queries. */
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export * from './arcgis/arcgis-feature-server-loader.js';
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export * from './arcgis/arcgis-image-server-loader.js';
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export * from './arcgis/arcgis-image-tile-loader.js';
|