Skip to content

Commit d630a39

Browse files
VirgilClyneVirgilClyne
committed
feat: 更新 GEOResourceManifest 类中的 HYBRID 功能
Update GEOResourceManifest.mjs
1 parent a6195cd commit d630a39

File tree

1 file changed

+9
-100
lines changed

1 file changed

+9
-100
lines changed

‎src/class/GEOResourceManifest.mjs‎

Lines changed: 9 additions & 100 deletions
Original file line numberDiff line numberDiff line change
@@ -93,70 +93,11 @@ export default class GEOResourceManifest {
9393
//Console.warn(`Basic baseURL: ${tile?.baseURL}`);
9494
break;
9595
case "RASTER_SATELLITE": // 7 卫星地图（2D）
96-
//Console.warn(`Satellite style: ${tile?.style}`);
97-
switch (settings.TileSet.Satellite) {
98-
case "HYBRID":
99-
default:
100-
break;
101-
case "CN":
102-
tile = caches?.CN?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.size === tile.size) || caches?.CN?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale) || caches?.CN?.tileSet?.find(i => i.style === tile.style) || tile;
103-
break;
104-
case "XX":
105-
switch (typeof tile.dataSet) {
106-
case "undefined":
107-
tile =
108-
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.size === tile.size) ||
109-
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.size === tile.size) ||
110-
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale) ||
111-
caches?.XX?.tileSet?.find(i => i.style === tile.style) ||
112-
tile;
113-
break;
114-
case "number":
115-
tile =
116-
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.size === tile.size && i.dataSet === tile.dataSet) ||
117-
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.size === tile.size && i.dataSet === tile.dataSet) ||
118-
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.dataSet === tile.dataSet) ||
119-
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.dataSet === tile.dataSet) ||
120-
tile;
121-
break;
122-
}
123-
break;
124-
}
125-
//Console.warn(`Satellite baseURL: ${tile?.baseURL}`);
126-
break;
12796
case "RASTER_SATELLITE_NIGHT": // 33 卫星地图（2D/夜间）
128-
//Console.warn(`Satellite style: ${tile?.style}`);
129-
switch (settings.TileSet.Satellite) {
130-
case "CN":
131-
tile = caches?.CN?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.size === tile.size) || caches?.CN?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale) || caches?.CN?.tileSet?.find(i => i.style === tile.style) || tile;
132-
break;
133-
case "HYBRID":
134-
case "XX":
135-
default:
136-
switch (typeof tile.dataSet) {
137-
case "undefined":
138-
tile =
139-
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.size === tile.size) ||
140-
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.size === tile.size) ||
141-
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale) ||
142-
caches?.XX?.tileSet?.find(i => i.style === tile.style) ||
143-
tile;
144-
break;
145-
case "number":
146-
tile =
147-
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.size === tile.size && i.dataSet === tile.dataSet) ||
148-
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.size === tile.size && i.dataSet === tile.dataSet) ||
149-
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.dataSet === tile.dataSet) ||
150-
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.dataSet === tile.dataSet) ||
151-
tile;
152-
break;
153-
}
154-
break;
155-
}
156-
//Console.warn(`Satellite baseURL: ${tile?.baseURL}`);
157-
break;
15897
case "RASTER_SATELLITE_DIGITIZE": // 35 卫星地图（2D/数字化）
15998
case "RASTER_SATELLITE_ASTC": // 45 卫星地图（2D/ASTC）
99+
case "RASTER_SATELLITE_POLAR": // 91 卫星地图（2D/极地）
100+
case "RASTER_SATELLITE_POLAR_NIGHT": // 95 卫星地图（2D/极地/夜间）
160101
//Console.warn(`Satellite style: ${tile?.style}`);
161102
switch (settings.TileSet.Satellite) {
162103
case "HYBRID":
@@ -188,38 +129,6 @@ export default class GEOResourceManifest {
188129
}
189130
//Console.warn(`Satellite baseURL: ${tile?.baseURL}`);
190131
break;
191-
case "RASTER_SATELLITE_POLAR": // 91 卫星地图（2D/极地）
192-
case "RASTER_SATELLITE_POLAR_NIGHT": // 95 卫星地图（2D/极地/夜间）
193-
//Console.warn(`Satellite style: ${tile?.style}`);
194-
switch (settings.TileSet.Satellite) {
195-
case "CN":
196-
tile = caches?.CN?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.size === tile.size) || caches?.CN?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale) || caches?.CN?.tileSet?.find(i => i.style === tile.style) || tile;
197-
break;
198-
case "HYBRID":
199-
case "XX":
200-
default:
201-
switch (typeof tile.dataSet) {
202-
case "undefined":
203-
tile =
204-
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.size === tile.size) ||
205-
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.size === tile.size) ||
206-
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale) ||
207-
caches?.XX?.tileSet?.find(i => i.style === tile.style) ||
208-
tile;
209-
break;
210-
case "number":
211-
tile =
212-
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.size === tile.size && i.dataSet === tile.dataSet) ||
213-
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.size === tile.size && i.dataSet === tile.dataSet) ||
214-
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.dataSet === tile.dataSet) ||
215-
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.dataSet === tile.dataSet) ||
216-
tile;
217-
break;
218-
}
219-
break;
220-
}
221-
//Console.warn(`Satellite baseURL: ${tile?.baseURL}`);
222-
break;
223132
case "VECTOR_TRAFFIC_SEGMENTS_FOR_RASTER": // 2 交通状况分段（卫星地图:显示交通状况）?
224133
case "VECTOR_TRAFFIC_INCIDENTS_FOR_RASTER": // 3 交通状况事件（卫星地图:显示交通状况）?
225134
case "VECTOR_TRAFFIC_SEGMENTS_AND_INCIDENTS_FOR_RASTER": // 4 交通状况分段和事件（卫星地图:显示交通状况）?
@@ -309,12 +218,12 @@ export default class GEOResourceManifest {
309218
//Console.warn(`Satellite style: ${tile?.style}`);
310219
switch (settings.TileSet.Satellite) {
311220
case "HYBRID":
221+
default:
312222
break;
313223
case "CN":
314224
tile = caches?.CN?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.size === tile.size) || caches?.CN?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale) || caches?.CN?.tileSet?.find(i => i.style === tile.style) || tile;
315225
break;
316226
case "XX":
317-
default:
318227
switch (typeof tile.dataSet) {
319228
case "undefined":
320229
tile =
@@ -337,9 +246,9 @@ export default class GEOResourceManifest {
337246
}
338247
//Console.warn(`Flyover baseURL: ${tile?.baseURL}`);
339248
break;
340-
case "SPUTNIK_VECTOR_BORDER": // 34 卫星地图（3D/俯瞰）边界
249+
case "SPUTNIK_VECTOR_BORDER": // 34 卫星地图（3D/俯瞰）边界（决定能否显示地球模型）
341250
//Console.warn(`Satellite style: ${tile?.style}`);
342-
switch (settings.TileSet.Satellite) {
251+
switch ("HYBRID" ?? settings.TileSet.Satellite) {
343252
case "CN":
344253
tile = caches?.CN?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.size === tile.size) || caches?.CN?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale) || caches?.CN?.tileSet?.find(i => i.style === tile.style) || tile;
345254
break;
@@ -472,20 +381,20 @@ export default class GEOResourceManifest {
472381
case "VECTOR_SPR_MODELS": // 59
473382
case "VECTOR_SPR_MATERIALS": // 60
474383
case "VECTOR_SPR_METADATA": // 61
475-
case "VECTOR_SPR_ROADS": // 66 卫星图下的道路网格，同时影响四处看看功能
384+
case "VECTOR_SPR_ROADS": // 66 (卫星图下的道路网格? 同时影响四处看看功能?)
476385
case "VECTOR_SPR_STANDARD": // 67
477-
case "SPR_ASSET_METADATA": // 78?
386+
case "SPR_ASSET_METADATA": // 78? (排除)
478387
case "VECTOR_SPR_POLAR": // 79
479-
case "VECTOR_SPR_MODELS_OCCLUSION": // 82?
388+
case "VECTOR_SPR_MODELS_OCCLUSION": // 82? (排除)
480389
//Console.warn(`Munin style: ${tile?.style}`);
481390
switch (settings.TileSet.Munin) {
482391
case "HYBRID":
392+
default:
483393
break;
484394
case "CN":
485395
tile = caches?.CN?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.size === tile.size) || caches?.CN?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale) || caches?.CN?.tileSet?.find(i => i.style === tile.style) || tile;
486396
break;
487397
case "XX":
488-
default:
489398
switch (typeof tile.dataSet) {
490399
case "undefined":
491400
tile =

0 commit comments

Comments
 (0)