s3m-three 0.4.17 → 0.4.18
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/dist/browser/s3m-three.iife.ext-three.js +24 -24
- package/dist/browser/s3m-three.iife.js +24 -24
- package/dist/core/AttributeQuery.d.ts +13 -0
- package/dist/core/AttributeQuery.d.ts.map +1 -1
- package/dist/core/AttributeQuery.js +20 -3
- package/dist/core/AttributeQuery.js.map +1 -1
- package/dist/core/AuthFetch.d.ts +52 -0
- package/dist/core/AuthFetch.d.ts.map +1 -0
- package/dist/core/AuthFetch.js +44 -0
- package/dist/core/AuthFetch.js.map +1 -0
- package/dist/index.d.ts +4 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +2 -0
- package/dist/index.js.map +1 -1
- package/dist/render/DatasetManager.d.ts +7 -1
- package/dist/render/DatasetManager.d.ts.map +1 -1
- package/dist/render/DatasetManager.js +2 -1
- package/dist/render/DatasetManager.js.map +1 -1
- package/dist/render/HostRenderer.d.ts +105 -0
- package/dist/render/HostRenderer.d.ts.map +1 -0
- package/dist/render/HostRenderer.js +170 -0
- package/dist/render/HostRenderer.js.map +1 -0
- package/dist/render/S3MViewer.d.ts +10 -0
- package/dist/render/S3MViewer.d.ts.map +1 -1
- package/dist/render/S3MViewer.js +13 -4
- package/dist/render/S3MViewer.js.map +1 -1
- package/dist/tileset/S3MTileset.d.ts +8 -0
- package/dist/tileset/S3MTileset.d.ts.map +1 -1
- package/dist/tileset/S3MTileset.js +8 -4
- package/dist/tileset/S3MTileset.js.map +1 -1
- package/package.json +1 -1
- package/src/core/AttributeQuery.ts +26 -3
- package/src/core/AuthFetch.ts +82 -0
- package/src/index.ts +4 -0
- package/src/render/DatasetManager.ts +9 -1
- package/src/render/HostRenderer.ts +222 -0
- package/src/render/S3MViewer.ts +22 -4
- package/src/tileset/S3MTileset.ts +13 -4
|
@@ -22,6 +22,7 @@
|
|
|
22
22
|
* 所以默认策略：`.fastjson` + 一次性把**全部字段**取回来（字段名很便宜，model 才是大头），
|
|
23
23
|
* 这样换专题字段时全部命中缓存，不再发请求。
|
|
24
24
|
*/
|
|
25
|
+
import { type AuthenticateFn } from './AuthFetch.js';
|
|
25
26
|
export interface AttributeQueryOptions {
|
|
26
27
|
/** 数据服务根地址，形如 https://host/iserver/services/data-xxx/rest/data */
|
|
27
28
|
dataServiceUrl: string;
|
|
@@ -38,6 +39,11 @@ export interface AttributeQueryOptions {
|
|
|
38
39
|
format?: 'auto' | 'fastjson' | 'json';
|
|
39
40
|
/** 便于测试时替换，默认用全局 fetch */
|
|
40
41
|
fetchImpl?: typeof fetch;
|
|
42
|
+
/**
|
|
43
|
+
* 鉴权适配函数（不填则用图层级的 `authenticate`）。请求发出前过一遍，
|
|
44
|
+
* 可改写 URL（加 `?token=`）或附加请求头。见 `AuthenticateFn`。
|
|
45
|
+
*/
|
|
46
|
+
authenticate?: AuthenticateFn;
|
|
41
47
|
}
|
|
42
48
|
export interface AttributeField {
|
|
43
49
|
name: string;
|
|
@@ -60,6 +66,7 @@ export declare class AttributeQuery {
|
|
|
60
66
|
private readonly _chunkSize;
|
|
61
67
|
private readonly _formatOption;
|
|
62
68
|
private readonly _fetch;
|
|
69
|
+
private readonly _authenticate;
|
|
63
70
|
private readonly _cache;
|
|
64
71
|
private _schema;
|
|
65
72
|
private _resolvedFields;
|
|
@@ -68,6 +75,12 @@ export declare class AttributeQuery {
|
|
|
68
75
|
constructor(options: AttributeQueryOptions);
|
|
69
76
|
/** 数据集的 REST 路径：.../datasources/name/{ds}/datasets/name/{name} */
|
|
70
77
|
get datasetPath(): string;
|
|
78
|
+
/**
|
|
79
|
+
* 带鉴权的请求：先过 `authenticate` 钩子改写 URL / 追加 header，再走本查询的
|
|
80
|
+
* 传输层（`fetchImpl` 或全局 fetch，自定义传输不被绕过）。未配置鉴权时与旧版
|
|
81
|
+
* 行为逐字一致（参数原样透传）。
|
|
82
|
+
*/
|
|
83
|
+
private _request;
|
|
71
84
|
/** 累计的请求代价（不清零，用来观察整体开销） */
|
|
72
85
|
get stats(): AttributeQueryStats;
|
|
73
86
|
/** 字段表（顺手也用来判断「这个数据集到底有没有属性表」） */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AttributeQuery.d.ts","sourceRoot":"","sources":["../../src/core/AttributeQuery.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;
|
|
1
|
+
{"version":3,"file":"AttributeQuery.d.ts","sourceRoot":"","sources":["../../src/core/AttributeQuery.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAEH,OAAO,EAAsB,KAAK,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAOzE,MAAM,WAAW,qBAAqB;IACpC,kEAAkE;IAClE,cAAc,EAAE,MAAM,CAAC;IACvB,mEAAmE;IACnE,WAAW,EAAE,MAAM,CAAC;IACpB,uDAAuD;IACvD,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,mDAAmD;IACnD,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,yBAAyB;IACzB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;mDAC+C;IAC/C,MAAM,CAAC,EAAE,MAAM,GAAG,UAAU,GAAG,MAAM,CAAC;IACtC,0BAA0B;IAC1B,SAAS,CAAC,EAAE,OAAO,KAAK,CAAC;IACzB;;;OAGG;IACH,YAAY,CAAC,EAAE,cAAc,CAAC;CAC/B;AAED,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,MAAM,YAAY,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,CAAC;AAE3D,sCAAsC;AACtC,MAAM,WAAW,mBAAmB;IAClC,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,EAAE,EAAE,MAAM,CAAC;CACZ;AAwBD,qBAAa,cAAc;IACzB,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IAEzB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAkB;IAC1C,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;IACpC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAA+B;IAC7D,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAe;IACtC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAA6B;IAC3D,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAmC;IAC1D,OAAO,CAAC,OAAO,CAAiC;IAChD,OAAO,CAAC,eAAe,CAAyB;IAChD,OAAO,CAAC,OAAO,CAAoC;IACnD,OAAO,CAAC,MAAM,CAAyD;gBAE3D,OAAO,EAAE,qBAAqB;IAiB1C,kEAAkE;IAClE,IAAI,WAAW,IAAI,MAAM,CAExB;IAED;;;;OAIG;YACW,QAAQ;IAStB,4BAA4B;IAC5B,IAAI,KAAK,IAAI,mBAAmB,CAE/B;IAED,kCAAkC;IAC5B,UAAU,IAAI,OAAO,CAAC,cAAc,EAAE,CAAC;IAU7C,uBAAuB;IACvB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAIhC,UAAU,IAAI,IAAI;IAKlB;;;OAGG;IACG,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;YAuBzD,cAAc;IAY5B;;;;;;;OAOG;YACW,cAAc;YAgBd,WAAW;YAsCX,KAAK;IAenB,OAAO,CAAC,MAAM;CAGf"}
|
|
@@ -22,6 +22,7 @@
|
|
|
22
22
|
* 所以默认策略：`.fastjson` + 一次性把**全部字段**取回来（字段名很便宜，model 才是大头），
|
|
23
23
|
* 这样换专题字段时全部命中缓存，不再发请求。
|
|
24
24
|
*/
|
|
25
|
+
import { resolveAuthRequest } from './AuthFetch.js';
|
|
25
26
|
const DEFAULT_ID_FIELD = 'SmID';
|
|
26
27
|
const DEFAULT_CHUNK_SIZE = 200;
|
|
27
28
|
/** 几何/索引字段取回来没用，还特别占带宽 */
|
|
@@ -46,6 +47,7 @@ export class AttributeQuery {
|
|
|
46
47
|
_chunkSize;
|
|
47
48
|
_formatOption;
|
|
48
49
|
_fetch;
|
|
50
|
+
_authenticate;
|
|
49
51
|
_cache = new Map();
|
|
50
52
|
_schema = null;
|
|
51
53
|
_resolvedFields = null;
|
|
@@ -66,11 +68,26 @@ export class AttributeQuery {
|
|
|
66
68
|
this._chunkSize = Math.max(1, options.chunkSize ?? DEFAULT_CHUNK_SIZE);
|
|
67
69
|
this._formatOption = options.format ?? 'auto';
|
|
68
70
|
this._fetch = options.fetchImpl ?? globalThis.fetch.bind(globalThis);
|
|
71
|
+
this._authenticate = options.authenticate;
|
|
69
72
|
}
|
|
70
73
|
/** 数据集的 REST 路径：.../datasources/name/{ds}/datasets/name/{name} */
|
|
71
74
|
get datasetPath() {
|
|
72
75
|
return `${this.dataServiceUrl}/datasources/name/${encodeURIComponent(this.datasourceName)}/datasets/name/${encodeURIComponent(this.datasetName)}`;
|
|
73
76
|
}
|
|
77
|
+
/**
|
|
78
|
+
* 带鉴权的请求：先过 `authenticate` 钩子改写 URL / 追加 header，再走本查询的
|
|
79
|
+
* 传输层（`fetchImpl` 或全局 fetch，自定义传输不被绕过）。未配置鉴权时与旧版
|
|
80
|
+
* 行为逐字一致（参数原样透传）。
|
|
81
|
+
*/
|
|
82
|
+
async _request(url, init) {
|
|
83
|
+
const resolved = await resolveAuthRequest(url, this._authenticate, 'attributes');
|
|
84
|
+
const hookHeaders = resolved.headers && Object.keys(resolved.headers).length > 0 ? resolved.headers : null;
|
|
85
|
+
if (!hookHeaders)
|
|
86
|
+
return init === undefined ? this._fetch(resolved.url) : this._fetch(resolved.url, init);
|
|
87
|
+
// 钩子头在前，init 头在后：调用方显式给的头（如 Content-Type）不被覆盖
|
|
88
|
+
const headers = { ...hookHeaders, ...init?.headers };
|
|
89
|
+
return this._fetch(resolved.url, { ...init, headers });
|
|
90
|
+
}
|
|
74
91
|
/** 累计的请求代价（不清零，用来观察整体开销） */
|
|
75
92
|
get stats() {
|
|
76
93
|
return { ...this._stats };
|
|
@@ -79,7 +96,7 @@ export class AttributeQuery {
|
|
|
79
96
|
async loadSchema() {
|
|
80
97
|
if (this._schema)
|
|
81
98
|
return this._schema;
|
|
82
|
-
const res = await this.
|
|
99
|
+
const res = await this._request(`${this.datasetPath}/fields.json`);
|
|
83
100
|
this._stats.requests++;
|
|
84
101
|
if (!res.ok)
|
|
85
102
|
throw new Error(`[s3m] 读取字段表失败 ${res.status}：${this.datasetPath}/fields.json`);
|
|
@@ -147,7 +164,7 @@ export class AttributeQuery {
|
|
|
147
164
|
if (this._formatOption !== 'auto')
|
|
148
165
|
return (this._format = this._formatOption);
|
|
149
166
|
try {
|
|
150
|
-
const res = await this.
|
|
167
|
+
const res = await this._request(`${this.datasetPath}/features.json?fromIndex=0&toIndex=1`);
|
|
151
168
|
this._stats.requests++;
|
|
152
169
|
const json = (await res.json());
|
|
153
170
|
const isModel = String(json.geometryType ?? '').toUpperCase().includes('MODEL');
|
|
@@ -201,7 +218,7 @@ export class AttributeQuery {
|
|
|
201
218
|
}
|
|
202
219
|
async _post(body, format) {
|
|
203
220
|
const t0 = performance.now();
|
|
204
|
-
const res = await this.
|
|
221
|
+
const res = await this._request(`${this.dataServiceUrl}/featureResults.${format}?returnContent=true`, {
|
|
205
222
|
method: 'POST',
|
|
206
223
|
headers: { 'Content-Type': 'application/json' },
|
|
207
224
|
body: JSON.stringify(body),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AttributeQuery.js","sourceRoot":"","sources":["../../src/core/AttributeQuery.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAEH,MAAM,gBAAgB,GAAG,MAAM,CAAC;AAChC,MAAM,kBAAkB,GAAG,GAAG,CAAC;AAC/B,0BAA0B;AAC1B,MAAM,WAAW,GAAG,IAAI,GAAG,CAAC,CAAC,YAAY,EAAE,YAAY,EAAE,eAAe,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"AttributeQuery.js","sourceRoot":"","sources":["../../src/core/AttributeQuery.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,52 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* 鉴权适配（Authenticate Hook）
|
|
3
|
+
*
|
|
4
|
+
* S3M 服务经常挂在带鉴权的网关后面：有的要求 URL 带 `?token=...`，有的要求
|
|
5
|
+
* 请求头带 `Authorization` / `X-Token`，还有的 token 会过期需要定期换。内核在
|
|
6
|
+
* 主线程发出的全部请求（数据集配置 scp、瓦片 .s3mb/.s3mblock、子图集 .texblock、
|
|
7
|
+
* 棱线缓存、iServer 属性查询）都从这一个钩子过一遍，由使用方统一改写。
|
|
8
|
+
*
|
|
9
|
+
* 设计约束（对应 AGENTS.md 不变式①）：不传 `authenticate` 时，请求路径与旧版
|
|
10
|
+
* 逐字一致——`authFetch` 直接短路到裸 `fetch(url)` / `fetch(url, init)`，连 init
|
|
11
|
+
* 对象都不新建。
|
|
12
|
+
*
|
|
13
|
+
* 注意：鉴权只作用于**发到网络上的请求**，不参与内核的缓存键（瓦片 URL 带 `#N`
|
|
14
|
+
* 片段与 nodes/pending 等内部 Map 的键都是改写前的原 URL），token 轮换不会导致
|
|
15
|
+
* 重复加载同一块瓦片。重试时每次重新过钩子，token 刷新后重试天然带上新值。
|
|
16
|
+
*/
|
|
17
|
+
/** 请求类别，钩子按类别区分处理（比如属性查询走另一个网关） */
|
|
18
|
+
export type AuthRequestKind = 'config' | 'tile' | 'texblock' | 'creases' | 'attributes';
|
|
19
|
+
/** 改写后的请求：实际请求的 URL + 需要附加的请求头 */
|
|
20
|
+
export interface AuthResolvedRequest {
|
|
21
|
+
/** 实际发到网络上的 URL（可追加 `?token=...` 等鉴权参数） */
|
|
22
|
+
url: string;
|
|
23
|
+
/** 需要附加的请求头（如 `Authorization` / `X-Token`） */
|
|
24
|
+
headers?: Record<string, string>;
|
|
25
|
+
}
|
|
26
|
+
/**
|
|
27
|
+
* 鉴权适配函数。每个请求发出前调用一次：
|
|
28
|
+
*
|
|
29
|
+
* - 返回 `string`：只改写 URL（最简形式，如追加 `?token=`）；
|
|
30
|
+
* - 返回 `{ url, headers }`：改写 URL 并附加请求头；
|
|
31
|
+
* - 返回 `Promise`：支持异步（如先向认证服务换 token）。
|
|
32
|
+
*
|
|
33
|
+
* ```js
|
|
34
|
+
* new S3MLayer({
|
|
35
|
+
* configUrl: 'https://gw.example.com/data/a.scp',
|
|
36
|
+
* authenticate: (url, kind) => ({
|
|
37
|
+
* url: `${url}${url.includes('?') ? '&' : '?'}token=${getToken()}`,
|
|
38
|
+
* headers: { 'X-Client': 's3m' },
|
|
39
|
+
* }),
|
|
40
|
+
* });
|
|
41
|
+
* ```
|
|
42
|
+
*/
|
|
43
|
+
export type AuthenticateFn = (url: string, kind: AuthRequestKind) => string | AuthResolvedRequest | Promise<string | AuthResolvedRequest>;
|
|
44
|
+
/** 把钩子返回值归一成 `{ url, headers }`；返回值异常时兜底用原 URL */
|
|
45
|
+
export declare function resolveAuthRequest(url: string, auth: AuthenticateFn | undefined, kind: AuthRequestKind): Promise<AuthResolvedRequest>;
|
|
46
|
+
/**
|
|
47
|
+
* 带鉴权的 fetch：先过钩子改写 URL / 追加 header，再发请求。
|
|
48
|
+
* `init.headers`（调用方自带的头）优先级高于钩子返回的 headers。
|
|
49
|
+
* `auth` 未配置时与裸 `fetch` 完全等价（参数原样透传，不新建 init）。
|
|
50
|
+
*/
|
|
51
|
+
export declare function authFetch(url: string, auth: AuthenticateFn | undefined, kind: AuthRequestKind, init?: RequestInit): Promise<Response>;
|
|
52
|
+
//# sourceMappingURL=AuthFetch.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"AuthFetch.d.ts","sourceRoot":"","sources":["../../src/core/AuthFetch.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,mCAAmC;AACnC,MAAM,MAAM,eAAe,GAAG,QAAQ,GAAG,MAAM,GAAG,UAAU,GAAG,SAAS,GAAG,YAAY,CAAC;AAExF,kCAAkC;AAClC,MAAM,WAAW,mBAAmB;IAClC,2CAA2C;IAC3C,GAAG,EAAE,MAAM,CAAC;IACZ,8CAA8C;IAC9C,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAClC;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,MAAM,cAAc,GAAG,CAC3B,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,eAAe,KAClB,MAAM,GAAG,mBAAmB,GAAG,OAAO,CAAC,MAAM,GAAG,mBAAmB,CAAC,CAAC;AAE1E,kDAAkD;AAClD,wBAAsB,kBAAkB,CACtC,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,cAAc,GAAG,SAAS,EAChC,IAAI,EAAE,eAAe,GACpB,OAAO,CAAC,mBAAmB,CAAC,CAM9B;AAED;;;;GAIG;AACH,wBAAsB,SAAS,CAC7B,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,cAAc,GAAG,SAAS,EAChC,IAAI,EAAE,eAAe,EACrB,IAAI,CAAC,EAAE,WAAW,GACjB,OAAO,CAAC,QAAQ,CAAC,CAQnB"}
|
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* 鉴权适配（Authenticate Hook）
|
|
3
|
+
*
|
|
4
|
+
* S3M 服务经常挂在带鉴权的网关后面：有的要求 URL 带 `?token=...`，有的要求
|
|
5
|
+
* 请求头带 `Authorization` / `X-Token`，还有的 token 会过期需要定期换。内核在
|
|
6
|
+
* 主线程发出的全部请求（数据集配置 scp、瓦片 .s3mb/.s3mblock、子图集 .texblock、
|
|
7
|
+
* 棱线缓存、iServer 属性查询）都从这一个钩子过一遍，由使用方统一改写。
|
|
8
|
+
*
|
|
9
|
+
* 设计约束（对应 AGENTS.md 不变式①）：不传 `authenticate` 时，请求路径与旧版
|
|
10
|
+
* 逐字一致——`authFetch` 直接短路到裸 `fetch(url)` / `fetch(url, init)`，连 init
|
|
11
|
+
* 对象都不新建。
|
|
12
|
+
*
|
|
13
|
+
* 注意：鉴权只作用于**发到网络上的请求**，不参与内核的缓存键（瓦片 URL 带 `#N`
|
|
14
|
+
* 片段与 nodes/pending 等内部 Map 的键都是改写前的原 URL），token 轮换不会导致
|
|
15
|
+
* 重复加载同一块瓦片。重试时每次重新过钩子，token 刷新后重试天然带上新值。
|
|
16
|
+
*/
|
|
17
|
+
/** 把钩子返回值归一成 `{ url, headers }`；返回值异常时兜底用原 URL */
|
|
18
|
+
export async function resolveAuthRequest(url, auth, kind) {
|
|
19
|
+
if (!auth)
|
|
20
|
+
return { url };
|
|
21
|
+
const out = await auth(url, kind);
|
|
22
|
+
if (typeof out === 'string')
|
|
23
|
+
return { url: out || url };
|
|
24
|
+
if (!out || typeof out !== 'object')
|
|
25
|
+
return { url };
|
|
26
|
+
return { url: out.url || url, headers: out.headers };
|
|
27
|
+
}
|
|
28
|
+
/**
|
|
29
|
+
* 带鉴权的 fetch：先过钩子改写 URL / 追加 header，再发请求。
|
|
30
|
+
* `init.headers`（调用方自带的头）优先级高于钩子返回的 headers。
|
|
31
|
+
* `auth` 未配置时与裸 `fetch` 完全等价（参数原样透传，不新建 init）。
|
|
32
|
+
*/
|
|
33
|
+
export async function authFetch(url, auth, kind, init) {
|
|
34
|
+
if (!auth)
|
|
35
|
+
return init === undefined ? fetch(url) : fetch(url, init);
|
|
36
|
+
const resolved = await resolveAuthRequest(url, auth, kind);
|
|
37
|
+
const hookHeaders = resolved.headers && Object.keys(resolved.headers).length > 0 ? resolved.headers : null;
|
|
38
|
+
if (!hookHeaders)
|
|
39
|
+
return init === undefined ? fetch(resolved.url) : fetch(resolved.url, init);
|
|
40
|
+
// 钩子头在前，init 头在后：调用方显式给的头不被覆盖
|
|
41
|
+
const headers = { ...hookHeaders, ...init?.headers };
|
|
42
|
+
return fetch(resolved.url, { ...init, headers });
|
|
43
|
+
}
|
|
44
|
+
//# sourceMappingURL=AuthFetch.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"AuthFetch.js","sourceRoot":"","sources":["../../src/core/AuthFetch.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAmCH,kDAAkD;AAClD,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,GAAW,EACX,IAAgC,EAChC,IAAqB;IAErB,IAAI,CAAC,IAAI;QAAE,OAAO,EAAE,GAAG,EAAE,CAAC;IAC1B,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAClC,IAAI,OAAO,GAAG,KAAK,QAAQ;QAAE,OAAO,EAAE,GAAG,EAAE,GAAG,IAAI,GAAG,EAAE,CAAC;IACxD,IAAI,CAAC,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ;QAAE,OAAO,EAAE,GAAG,EAAE,CAAC;IACpD,OAAO,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,IAAI,GAAG,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,CAAC;AACvD,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,SAAS,CAC7B,GAAW,EACX,IAAgC,EAChC,IAAqB,EACrB,IAAkB;IAElB,IAAI,CAAC,IAAI;QAAE,OAAO,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IACrE,MAAM,QAAQ,GAAG,MAAM,kBAAkB,CAAC,GAAG,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;IAC3D,MAAM,WAAW,GAAG,QAAQ,CAAC,OAAO,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC;IAC3G,IAAI,CAAC,WAAW;QAAE,OAAO,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAC9F,8BAA8B;IAC9B,MAAM,OAAO,GAAG,EAAE,GAAG,WAAW,EAAE,GAAG,IAAI,EAAE,OAAO,EAA4B,CAAC;IAC/E,OAAO,KAAK,CAAC,QAAQ,CAAC,GAAG,EAAE,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;AACnD,CAAC"}
|
package/dist/index.d.ts
CHANGED
|
@@ -15,6 +15,8 @@ export { BinaryReader } from './core/BinaryReader.js';
|
|
|
15
15
|
export { resolveFeature, measureSegments, buildAttributes, DEFAULT_FLOOR_HEIGHT } from './core/FeatureInfo.js';
|
|
16
16
|
export { AttributeQuery } from './core/AttributeQuery.js';
|
|
17
17
|
export type { AttributeQueryOptions, AttributeField, AttributeRow, } from './core/AttributeQuery.js';
|
|
18
|
+
export type { AuthRequestKind, AuthResolvedRequest, AuthenticateFn } from './core/AuthFetch.js';
|
|
19
|
+
export { resolveAuthRequest, authFetch } from './core/AuthFetch.js';
|
|
18
20
|
export type { Vec3, BoundingBox, AttrDType, VertexAttribute, IndexPackage, VertexPackage, PickSegment, PickEntry, GeoPackageEntry, Geode, PageLOD, GroupNode, S3MTexture, ParsedTile, Anchor, Stats, FeatureAttributes, SegmentBox, StyleUniforms, } from './core/types.js';
|
|
19
21
|
export { EARTH_RADIUS, mercatorFromLngLat, lngLatFromMercator, worldFromLngLat, lngLatFromWorld, } from './render/GeoAdapter.js';
|
|
20
22
|
export type { GeoAdapter } from './render/GeoAdapter.js';
|
|
@@ -22,6 +24,8 @@ export { S3MTileset } from './tileset/S3MTileset.js';
|
|
|
22
24
|
export type { TileNode, BuildTileFn, S3MTilesetOptions } from './tileset/S3MTileset.js';
|
|
23
25
|
export { S3MViewer } from './render/S3MViewer.js';
|
|
24
26
|
export type { S3MViewerOptions, PickResult, } from './render/S3MViewer.js';
|
|
27
|
+
export { HostRenderer } from './render/HostRenderer.js';
|
|
28
|
+
export type { HostRendererOptions, HostFrame } from './render/HostRenderer.js';
|
|
25
29
|
export { DEFAULT_STYLE, STYLE, STYLE_LABELS, SELECT_MODE, SELECT_MODE_LABELS, } from './render/StyleMaterial.js';
|
|
26
30
|
export type { S3MStyle } from './render/StyleMaterial.js';
|
|
27
31
|
export { GroundManager, DatasetManager, FeatureStyleManager, } from './render/S3MViewer.js';
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAGH,OAAO,EAAE,SAAS,EAAE,cAAc,EAAE,WAAW,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACtG,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAC/D,YAAY,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACpE,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAC/G,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,YAAY,EACV,qBAAqB,EACrB,cAAc,EACd,YAAY,GACb,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/dist/index.js
CHANGED
|
@@ -14,12 +14,14 @@ export { parseS3M1, isS3M1Buffer } from './core/S3M1Parser.js';
|
|
|
14
14
|
export { BinaryReader } from './core/BinaryReader.js';
|
|
15
15
|
export { resolveFeature, measureSegments, buildAttributes, DEFAULT_FLOOR_HEIGHT } from './core/FeatureInfo.js';
|
|
16
16
|
export { AttributeQuery } from './core/AttributeQuery.js';
|
|
17
|
+
export { resolveAuthRequest, authFetch } from './core/AuthFetch.js';
|
|
17
18
|
// —— 地理坐标适配（宿主无关接口 + 墨卡托兜底）
|
|
18
19
|
export { EARTH_RADIUS, mercatorFromLngLat, lngLatFromMercator, worldFromLngLat, lngLatFromWorld, } from './render/GeoAdapter.js';
|
|
19
20
|
// —— 瓦片层
|
|
20
21
|
export { S3MTileset } from './tileset/S3MTileset.js';
|
|
21
22
|
// —— 渲染层
|
|
22
23
|
export { S3MViewer } from './render/S3MViewer.js';
|
|
24
|
+
export { HostRenderer } from './render/HostRenderer.js';
|
|
23
25
|
export { DEFAULT_STYLE, STYLE, STYLE_LABELS, SELECT_MODE, SELECT_MODE_LABELS, } from './render/StyleMaterial.js';
|
|
24
26
|
export { GroundManager, DatasetManager, FeatureStyleManager, } from './render/S3MViewer.js';
|
|
25
27
|
export { resolveRotationMatrix, extractEulerAngles, } from './render/FeatureStyleManager.js';
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,oCAAoC;AACpC,OAAO,EAAE,SAAS,EAAE,cAAc,EAAE,WAAW,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACtG,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAE/D,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAC/G,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,oCAAoC;AACpC,OAAO,EAAE,SAAS,EAAE,cAAc,EAAE,WAAW,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACtG,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAE/D,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAC/G,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAO1D,OAAO,EAAE,kBAAkB,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAyBpE,4BAA4B;AAC5B,OAAO,EACL,YAAY,EACZ,kBAAkB,EAClB,kBAAkB,EAClB,eAAe,EACf,eAAe,GAChB,MAAM,wBAAwB,CAAC;AAGhC,SAAS;AACT,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAGrD,SAAS;AACT,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAKlD,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAExD,OAAO,EACL,aAAa,EACb,KAAK,EACL,YAAY,EACZ,WAAW,EACX,kBAAkB,GACnB,MAAM,2BAA2B,CAAC;AAEnC,OAAO,EACL,aAAa,EACb,cAAc,EACd,mBAAmB,GACpB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EACL,qBAAqB,EACrB,kBAAkB,GACnB,MAAM,iCAAiC,CAAC;AAEzC,OAAO,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAuB9E,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAG/D,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAG7G,OAAO,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAGhG,OAAO,EACL,oBAAoB,EACpB,oBAAoB,EACpB,qBAAqB,GACtB,MAAM,2BAA2B,CAAC;AAGnC,OAAO,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC5E,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAEnF,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAItD,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAS3F,OAAO,EACL,aAAa,EACb,eAAe,EACf,kBAAkB,EAClB,uBAAuB,EACvB,cAAc,EACd,iBAAiB,GAClB,MAAM,6BAA6B,CAAC;AAGrC,OAAO,EACL,uBAAuB,EACvB,wBAAwB,EACxB,sBAAsB,EACtB,wBAAwB,GACzB,MAAM,uBAAuB,CAAC;AAG/B,OAAO,EAAE,SAAS,IAAI,OAAO,EAAE,MAAM,uBAAuB,CAAC"}
|
|
@@ -9,6 +9,7 @@
|
|
|
9
9
|
*/
|
|
10
10
|
import * as THREE from 'three';
|
|
11
11
|
import { S3MTileset } from '../tileset/S3MTileset.js';
|
|
12
|
+
import type { AuthenticateFn } from '../core/AuthFetch.js';
|
|
12
13
|
import type { Anchor } from '../core/types.js';
|
|
13
14
|
import { type GeoAdapter } from './GeoAdapter.js';
|
|
14
15
|
export type DatasetAlignment = 'origin' | 'bottom' | 'top' | 'center';
|
|
@@ -41,6 +42,11 @@ export interface S3MDatasetOptions {
|
|
|
41
42
|
* - true / false：强制开 / 关（例如地形、绿地、道路只显示材质、不描边）
|
|
42
43
|
*/
|
|
43
44
|
enableEdges?: boolean;
|
|
45
|
+
/**
|
|
46
|
+
* 本数据集专属的鉴权适配函数（不填则用图层级的 `authenticate`）。
|
|
47
|
+
* 适合多数据集走不同网关 / 不同 token 的场景。见 `AuthenticateFn`。
|
|
48
|
+
*/
|
|
49
|
+
authenticate?: AuthenticateFn;
|
|
44
50
|
}
|
|
45
51
|
export interface S3MDatasetEntry {
|
|
46
52
|
id: string;
|
|
@@ -93,7 +99,7 @@ export declare class DatasetManager {
|
|
|
93
99
|
/**
|
|
94
100
|
* 注册并加载数据集
|
|
95
101
|
*/
|
|
96
|
-
addDataset(ds: S3MDatasetOptions, scene: THREE.Scene, geo: GeoAdapter | null, uniforms: any, defaultLodRangeScale: number, buildTile: any, maxTiles: number, maxConcurrent: number, callbacks: DatasetManagerCallbacks, maxTriangles?: number, maxImageCache?: number): Promise<S3MDatasetEntry>;
|
|
102
|
+
addDataset(ds: S3MDatasetOptions, scene: THREE.Scene, geo: GeoAdapter | null, uniforms: any, defaultLodRangeScale: number, buildTile: any, maxTiles: number, maxConcurrent: number, callbacks: DatasetManagerCallbacks, maxTriangles?: number, maxImageCache?: number, authenticate?: AuthenticateFn): Promise<S3MDatasetEntry>;
|
|
97
103
|
/**
|
|
98
104
|
* 移除指定数据集
|
|
99
105
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DatasetManager.d.ts","sourceRoot":"","sources":["../../src/render/DatasetManager.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,UAAU,EAAmB,MAAM,0BAA0B,CAAC;AACvE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAmB,KAAK,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAEnE,MAAM,MAAM,gBAAgB,GAAG,QAAQ,GAAG,QAAQ,GAAG,KAAK,GAAG,QAAQ,CAAC;AAEtE,MAAM,WAAW,iBAAiB;IAChC,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,yCAAyC;IACzC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,yCAAyC;IACzC,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB;;;;;;OAMG;IACH,KAAK,CAAC,EAAE,gBAAgB,CAAC;IACzB,kDAAkD;IAClD,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,gFAAgF;IAChF,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB;;;;OAIG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"DatasetManager.d.ts","sourceRoot":"","sources":["../../src/render/DatasetManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -94,7 +94,7 @@ export class DatasetManager {
|
|
|
94
94
|
/**
|
|
95
95
|
* 注册并加载数据集
|
|
96
96
|
*/
|
|
97
|
-
async addDataset(ds, scene, geo, uniforms, defaultLodRangeScale, buildTile, maxTiles, maxConcurrent, callbacks, maxTriangles = Infinity, maxImageCache = 128) {
|
|
97
|
+
async addDataset(ds, scene, geo, uniforms, defaultLodRangeScale, buildTile, maxTiles, maxConcurrent, callbacks, maxTriangles = Infinity, maxImageCache = 128, authenticate) {
|
|
98
98
|
const existing = this.datasets.get(ds.id);
|
|
99
99
|
if (existing)
|
|
100
100
|
return existing;
|
|
@@ -126,6 +126,7 @@ export class DatasetManager {
|
|
|
126
126
|
lodRangeScale: ds.lodRangeScale ?? defaultLodRangeScale,
|
|
127
127
|
buildTile: buildTile ?? null,
|
|
128
128
|
useWorker: ds.useWorker,
|
|
129
|
+
authenticate: ds.authenticate ?? authenticate,
|
|
129
130
|
uniforms: uniforms,
|
|
130
131
|
onTile: (node) => {
|
|
131
132
|
callbacks.onTile(node, entry);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DatasetManager.js","sourceRoot":"","sources":["../../src/render/DatasetManager.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"DatasetManager.js","sourceRoot":"","sources":["../../src/render/DatasetManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,105 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* 宿主无关渲染底座（HostRenderer）
|
|
3
|
+
*
|
|
4
|
+
* 把「宿主协议 ↔ s3m-three 渲染内核」的**宿主无关**部分抽出来，作为所有地图适配层
|
|
5
|
+
* （MapLibre / Mapbox / 未来的 ArcGIS / Cesium）的共同基类。它只做三件事：
|
|
6
|
+
*
|
|
7
|
+
* 1. 持有并构造 `S3MViewer`（渲染内核，宿主无关）；
|
|
8
|
+
* 2. 提供每帧驱动（把宿主给的 world→clip 矩阵喂给内核，并按需请求下一帧）、
|
|
9
|
+
* 生命周期（mount / restore / unmount）、投影模式状态与近平面缩放状态；
|
|
10
|
+
* 3. 把「宿主能力」做成两个抽象钩子 `requestRepaint()` / `getBearing()`，
|
|
11
|
+
* 由具体适配器实现（maplibre → `triggerRepaint()`，arcgis → `requestRender()`）。
|
|
12
|
+
*
|
|
13
|
+
* 凡是依赖具体地图 API 的东西（CustomLayerInterface 形态、从宿主 render 参数里抽矩阵、
|
|
14
|
+
* 事件绑定、上下文恢复重加图层、经纬度→墨卡托的 WorldCoordinateHelper 提取）都**不在这里**——
|
|
15
|
+
* 那是各适配层自己的事。这样「绕开墨卡托」也成为可能：非墨卡托宿主（ECEF / 局部米制）只要
|
|
16
|
+
* 实现 `requestRepaint` 并提供返回自己坐标系的 GeoAdapter，内核就完全不碰墨卡托。
|
|
17
|
+
*
|
|
18
|
+
* 设计约束（对应 AGENTS.md 不变式①）：本类不引入任何默认行为变更；maplibre 适配器继承它后，
|
|
19
|
+
* 默认路径与改动前逐字一致。
|
|
20
|
+
*/
|
|
21
|
+
import { S3MViewer } from './S3MViewer.js';
|
|
22
|
+
import type { S3MViewerOptions, PickResult } from './S3MViewer.js';
|
|
23
|
+
import type { ProjectionMode } from './OrthoProjection.js';
|
|
24
|
+
import type { TransitionOptions } from '../anim/Animator.js';
|
|
25
|
+
import type { Stats } from '../core/types.js';
|
|
26
|
+
import type { S3MDatasetEntry } from './DatasetManager.js';
|
|
27
|
+
/** HostRenderer 构造选项：渲染内核选项 + 三个适配器层专属开关 */
|
|
28
|
+
export interface HostRendererOptions extends S3MViewerOptions {
|
|
29
|
+
/** 图层 / 适配器 id，默认 's3m' */
|
|
30
|
+
id?: string;
|
|
31
|
+
/** 投影模式，默认 'perspective'（跟随宿主） */
|
|
32
|
+
projection?: ProjectionMode;
|
|
33
|
+
/** 近裁剪面缩放系数（0 < scale < 1，默认 1 = 不改） */
|
|
34
|
+
nearPlaneScale?: number;
|
|
35
|
+
}
|
|
36
|
+
/** 每帧喂给内核的矩阵输入（宿主无关；适配器负责从宿主 render 参数里抽出来） */
|
|
37
|
+
export interface HostFrame {
|
|
38
|
+
/** world→clip 矩阵（宿主坐标系下） */
|
|
39
|
+
mvp: ArrayLike<number>;
|
|
40
|
+
/** 相机在场景 ENU 中的位置（米，相对场景锚点） */
|
|
41
|
+
cameraEnu: [number, number, number];
|
|
42
|
+
/** 垂直视场角（弧度），用于 LOD 屏幕误差 */
|
|
43
|
+
fovRad: number;
|
|
44
|
+
/** 绘图缓冲高度（像素），LOD 判定用 */
|
|
45
|
+
canvasHeight: number;
|
|
46
|
+
}
|
|
47
|
+
/**
|
|
48
|
+
* 宿主无关渲染底座。具体地图适配器（如 S3MLayer）继承它，只补宿主专属胶水。
|
|
49
|
+
*/
|
|
50
|
+
export declare abstract class HostRenderer {
|
|
51
|
+
readonly id: string;
|
|
52
|
+
readonly options: HostRendererOptions;
|
|
53
|
+
readonly pickable: boolean;
|
|
54
|
+
/** 公开回调，可被使用方运行时重新赋值 */
|
|
55
|
+
onStats: (stats: Stats) => void;
|
|
56
|
+
onReady: (entry: S3MDatasetEntry) => void;
|
|
57
|
+
onPick: (result: PickResult | null) => void;
|
|
58
|
+
onError: (error: unknown) => void;
|
|
59
|
+
/** 渲染内核（宿主无关） */
|
|
60
|
+
readonly viewer: S3MViewer;
|
|
61
|
+
/** 当前投影模式 */
|
|
62
|
+
protected _projection: ProjectionMode;
|
|
63
|
+
/** 正交插值比例（0 = 纯透视，1 = 纯正交）；过渡期间由 animator 平滑推进 */
|
|
64
|
+
protected _projectionT: number;
|
|
65
|
+
/** 正交不可用只告警一次 */
|
|
66
|
+
protected _orthoWarned: boolean;
|
|
67
|
+
/** 近裁剪面缩放系数，1 = 不改（默认） */
|
|
68
|
+
protected _nearPlaneScale: number;
|
|
69
|
+
constructor(options?: HostRendererOptions);
|
|
70
|
+
/**
|
|
71
|
+
* 宿主能力的钩子：请求下一帧重绘。
|
|
72
|
+
* maplibre → `map.triggerRepaint()`；arcgis → `externalRenderers.requestRender(view)`。
|
|
73
|
+
*/
|
|
74
|
+
protected abstract requestRepaint(): void;
|
|
75
|
+
/** 宿主方位角（度）；宿主无关默认 0（灯光不跟随视角） */
|
|
76
|
+
protected getBearing(): number;
|
|
77
|
+
/** 挂载渲染内核到宿主的 canvas + 共享 GL 上下文（上下文恢复时原地换新 renderer） */
|
|
78
|
+
protected mountViewer(canvas: HTMLCanvasElement, gl: WebGLRenderingContext | WebGL2RenderingContext): void;
|
|
79
|
+
/** 卸载渲染内核（保留已加载的瓦片，下次 mount 可复用） */
|
|
80
|
+
protected unmountViewer(): void;
|
|
81
|
+
/**
|
|
82
|
+
* 把宿主抽好的矩阵喂给内核，并按需请求下一帧。
|
|
83
|
+
* 返回内核是否需要继续驱动（动态着色 / 瓦片加载中 / LOD 变化）。
|
|
84
|
+
*/
|
|
85
|
+
protected driveFrame(frame: HostFrame): boolean;
|
|
86
|
+
/**
|
|
87
|
+
* 切换投影模式，可带平滑过渡。
|
|
88
|
+
* 正交只影响本层：底图瓦片、地形、DOM Marker / 弹窗仍走宿主的透视投影。
|
|
89
|
+
* 拾取、选中描边、按单体着色/隐藏/抬高不受影响。
|
|
90
|
+
*/
|
|
91
|
+
setProjection(mode: ProjectionMode, transition?: TransitionOptions): void;
|
|
92
|
+
/** 当前投影模式 */
|
|
93
|
+
get projection(): ProjectionMode;
|
|
94
|
+
/** 当前正交插值比例（0 = 纯透视，1 = 纯正交） */
|
|
95
|
+
get projectionT(): number;
|
|
96
|
+
/** 正交插值参数通道：由 animator 平滑推进，写回时请求重绘 */
|
|
97
|
+
protected _ensureProjectionChannel(): void;
|
|
98
|
+
/** 动态调整近裁剪面缩放（0 < scale < 1）。传 1 / 0 / 非法值 = 恢复宿主原始 near */
|
|
99
|
+
setNearPlaneScale(scale: number): void;
|
|
100
|
+
/** 当前近裁剪面缩放系数（1 = 不改，用宿主的默认值） */
|
|
101
|
+
get nearPlaneScale(): number;
|
|
102
|
+
/** 近裁剪缩放系数的合法化：非数字 / <=0 / >=1 一律视为「不改」 */
|
|
103
|
+
static normalizeNearPlaneScale(v: number | undefined): number;
|
|
104
|
+
}
|
|
105
|
+
//# sourceMappingURL=HostRenderer.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"HostRenderer.d.ts","sourceRoot":"","sources":["../../src/render/HostRenderer.ts"],"names":[],"mappings":"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"}
|