Skip to content

Commit e3ad618

Browse files
VirgilClyneVirgilClyne
committed
fix: GEOResourceManifest 类 tileSets 重复筛选
Update GEOResourceManifest.mjs
1 parent 147c7f5 commit e3ad618

File tree

1 file changed

+8
-48
lines changed

1 file changed

+8
-48
lines changed

‎src/class/GEOResourceManifest.mjs‎

Lines changed: 8 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ export default class GEOResourceManifest {
9090
case "VECTOR_STREET_LANDMARKS": // 64 街道地标?
9191
case "VECTOR_BUILDINGS_V2": // 73 建筑模型V2（3D/上色）
9292
Console.info(`Basic style: ${tile?.style}`);
93-
tile = caches?.XX?.tileSet?.find(i => (i.style === tile.style && i.scale === tile.scale && i.size === tile.size && i.dataSet === tile.dataSet)) || caches?.XX?.tileSet?.find(i => (i.style === tile.style && i.scale === tile.scale && i.size === tile.size && i.dataSet === tile.dataSet)) || caches?.XX?.tileSet?.find(i => (i.style === tile.style && i.scale === tile.scale && i.dataSet === tile.dataSet)) || caches?.XX?.tileSet?.find(i => (i.style === tile.style && i.dataSet === tile.dataSet)) || tile;
93+
tile = caches?.XX?.tileSet?.find(i => (i.style === tile.style && i.scale === tile.scale && i.size === tile.size && i.dataSet === tile.dataSet)) || caches?.XX?.tileSet?.find(i => (i.style === tile.style && i.scale === tile.scale && i.dataSet === tile.dataSet)) || caches?.XX?.tileSet?.find(i => (i.style === tile.style && i.dataSet === tile.dataSet)) || tile;
9494
Console.info(`Basic baseURL: ${tile?.baseURL}`);
9595
break;
9696
*/
@@ -112,15 +112,13 @@ export default class GEOResourceManifest {
112112
switch (typeof tile.dataSet) {
113113
case "undefined":
114114
tile =
115-
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.size === tile.size) ||
116115
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.size === tile.size) ||
117116
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale) ||
118117
caches?.XX?.tileSet?.find(i => i.style === tile.style) ||
119118
tile;
120119
break;
121120
case "number":
122121
tile =
123-
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.size === tile.size && i.dataSet === tile.dataSet) ||
124122
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.size === tile.size && i.dataSet === tile.dataSet) ||
125123
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.dataSet === tile.dataSet) ||
126124
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.dataSet === tile.dataSet) ||
@@ -153,15 +151,13 @@ export default class GEOResourceManifest {
153151
switch (typeof tile.dataSet) {
154152
case "undefined":
155153
tile =
156-
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.size === tile.size) ||
157154
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.size === tile.size) ||
158155
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale) ||
159156
caches?.XX?.tileSet?.find(i => i.style === tile.style) ||
160157
tile;
161158
break;
162159
case "number":
163160
tile =
164-
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.size === tile.size && i.dataSet === tile.dataSet) ||
165161
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.size === tile.size && i.dataSet === tile.dataSet) ||
166162
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.dataSet === tile.dataSet) ||
167163
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.dataSet === tile.dataSet) ||
@@ -193,15 +189,13 @@ export default class GEOResourceManifest {
193189
switch (typeof tile.dataSet) {
194190
case "undefined":
195191
tile =
196-
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.size === tile.size) ||
197192
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.size === tile.size) ||
198193
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale) ||
199194
caches?.XX?.tileSet?.find(i => i.style === tile.style) ||
200195
tile;
201196
break;
202197
case "number":
203198
tile =
204-
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.size === tile.size && i.dataSet === tile.dataSet) ||
205199
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.size === tile.size && i.dataSet === tile.dataSet) ||
206200
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.dataSet === tile.dataSet) ||
207201
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.dataSet === tile.dataSet) ||
@@ -230,15 +224,13 @@ export default class GEOResourceManifest {
230224
switch (typeof tile.dataSet) {
231225
case "undefined":
232226
tile =
233-
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.size === tile.size) ||
234227
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.size === tile.size) ||
235228
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale) ||
236229
caches?.XX?.tileSet?.find(i => i.style === tile.style) ||
237230
tile;
238231
break;
239232
case "number":
240233
tile =
241-
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.size === tile.size && i.dataSet === tile.dataSet) ||
242234
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.size === tile.size && i.dataSet === tile.dataSet) ||
243235
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.dataSet === tile.dataSet) ||
244236
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.dataSet === tile.dataSet) ||
@@ -264,15 +256,13 @@ export default class GEOResourceManifest {
264256
switch (typeof tile.dataSet) {
265257
case "undefined":
266258
tile =
267-
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.size === tile.size) ||
268259
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.size === tile.size) ||
269260
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale) ||
270261
caches?.XX?.tileSet?.find(i => i.style === tile.style) ||
271262
tile;
272263
break;
273264
case "number":
274265
tile =
275-
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.size === tile.size && i.dataSet === tile.dataSet) ||
276266
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.size === tile.size && i.dataSet === tile.dataSet) ||
277267
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.dataSet === tile.dataSet) ||
278268
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.dataSet === tile.dataSet) ||
@@ -299,16 +289,10 @@ export default class GEOResourceManifest {
299289
default:
300290
switch (typeof tile.dataSet) {
301291
case "undefined":
302-
tile =
303-
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.size === tile.size) ||
304-
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.size === tile.size) ||
305-
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale) ||
306-
caches?.XX?.tileSet?.find(i => i.style === tile.style) ||
307-
tile;
292+
tile = caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.size === tile.size) || caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale) || caches?.XX?.tileSet?.find(i => i.style === tile.style) || tile;
308293
break;
309294
case "number":
310295
tile =
311-
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.size === tile.size && i.dataSet === tile.dataSet) ||
312296
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.size === tile.size && i.dataSet === tile.dataSet) ||
313297
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.dataSet === tile.dataSet) ||
314298
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.dataSet === tile.dataSet) ||
@@ -333,16 +317,10 @@ export default class GEOResourceManifest {
333317
default:
334318
switch (typeof tile.dataSet) {
335319
case "undefined":
336-
tile =
337-
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.size === tile.size) ||
338-
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.size === tile.size) ||
339-
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale) ||
340-
caches?.XX?.tileSet?.find(i => i.style === tile.style) ||
341-
tile;
320+
tile = caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.size === tile.size) || caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale) || caches?.XX?.tileSet?.find(i => i.style === tile.style) || tile;
342321
break;
343322
case "number":
344323
tile =
345-
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.size === tile.size && i.dataSet === tile.dataSet) ||
346324
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.size === tile.size && i.dataSet === tile.dataSet) ||
347325
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.dataSet === tile.dataSet) ||
348326
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.dataSet === tile.dataSet) ||
@@ -366,16 +344,10 @@ export default class GEOResourceManifest {
366344
default:
367345
switch (typeof tile.dataSet) {
368346
case "undefined":
369-
tile =
370-
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.size === tile.size) ||
371-
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.size === tile.size) ||
372-
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale) ||
373-
caches?.XX?.tileSet?.find(i => i.style === tile.style) ||
374-
tile;
347+
tile = caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.size === tile.size) || caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale) || caches?.XX?.tileSet?.find(i => i.style === tile.style) || tile;
375348
break;
376349
case "number":
377350
tile =
378-
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.size === tile.size && i.dataSet === tile.dataSet) ||
379351
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.size === tile.size && i.dataSet === tile.dataSet) ||
380352
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.dataSet === tile.dataSet) ||
381353
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.dataSet === tile.dataSet) ||
@@ -398,16 +370,10 @@ export default class GEOResourceManifest {
398370
default:
399371
switch (typeof tile.dataSet) {
400372
case "undefined":
401-
tile =
402-
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.size === tile.size) ||
403-
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.size === tile.size) ||
404-
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale) ||
405-
caches?.XX?.tileSet?.find(i => i.style === tile.style) ||
406-
tile;
373+
tile = caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.size === tile.size) || caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale) || caches?.XX?.tileSet?.find(i => i.style === tile.style) || tile;
407374
break;
408375
case "number":
409376
tile =
410-
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.size === tile.size && i.dataSet === tile.dataSet) ||
411377
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.size === tile.size && i.dataSet === tile.dataSet) ||
412378
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.dataSet === tile.dataSet) ||
413379
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.dataSet === tile.dataSet) ||
@@ -470,16 +436,10 @@ export default class GEOResourceManifest {
470436
case "Apple":
471437
switch (typeof tile.dataSet) {
472438
case "undefined":
473-
tile =
474-
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.size === tile.size) ||
475-
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.size === tile.size) ||
476-
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale) ||
477-
caches?.XX?.tileSet?.find(i => i.style === tile.style) ||
478-
tile;
439+
tile = caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.size === tile.size) || caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale) || caches?.XX?.tileSet?.find(i => i.style === tile.style) || tile;
479440
break;
480441
case "number":
481442
tile =
482-
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.size === tile.size && i.dataSet === tile.dataSet) ||
483443
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.size === tile.size && i.dataSet === tile.dataSet) ||
484444
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.dataSet === tile.dataSet) ||
485445
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.dataSet === tile.dataSet) ||
@@ -507,7 +467,7 @@ export default class GEOResourceManifest {
507467
case "VECTOR_ROAD_SELECTION": // 87 道路选区?
508468
case "VECTOR_REGION_METADATA": // 88 区域元数据?
509469
Console.info(`TEST style: ${tile?.style}`);
510-
tile = caches?.XX?.tileSet?.find(i => (i.style === tile.style && i.scale === tile.scale && i.size === tile.size && i.dataSet === tile.dataSet)) || caches?.XX?.tileSet?.find(i => (i.style === tile.style && i.scale === tile.scale && i.size === tile.size && i.dataSet === tile.dataSet)) || caches?.XX?.tileSet?.find(i => (i.style === tile.style && i.scale === tile.scale && i.dataSet === tile.dataSet)) || caches?.XX?.tileSet?.find(i => (i.style === tile.style && i.dataSet === tile.dataSet)) || tile;
470+
tile = caches?.XX?.tileSet?.find(i => (i.style === tile.style && i.scale === tile.scale && i.size === tile.size && i.dataSet === tile.dataSet)) || caches?.XX?.tileSet?.find(i => (i.style === tile.style && i.scale === tile.scale && i.dataSet === tile.dataSet)) || caches?.XX?.tileSet?.find(i => (i.style === tile.style && i.dataSet === tile.dataSet)) || tile;
511471
Console.info(`TEST baseURL: ${tile?.baseURL}`);
512472
break;
513473
*/
@@ -532,7 +492,7 @@ export default class GEOResourceManifest {
532492
/*
533493
switch (countryCode) {
534494
case "CN":
535-
tile = caches?.XX?.tileSet?.find(i => (i.style === tile.style && i.scale === tile.scale && i.size === tile.size && i.dataSet === tile.dataSet)) || caches?.XX?.tileSet?.find(i => (i.style === tile.style && i.scale === tile.scale && i.size === tile.size && i.dataSet === tile.dataSet)) || caches?.XX?.tileSet?.find(i => (i.style === tile.style && i.scale === tile.scale && i.dataSet === tile.dataSet)) || caches?.XX?.tileSet?.find(i => (i.style === tile.style && i.dataSet === tile.dataSet)) || tile;
495+
tile = caches?.XX?.tileSet?.find(i => (i.style === tile.style && i.scale === tile.scale && i.size === tile.size && i.dataSet === tile.dataSet)) || caches?.XX?.tileSet?.find(i => (i.style === tile.style && i.scale === tile.scale && i.dataSet === tile.dataSet)) || caches?.XX?.tileSet?.find(i => (i.style === tile.style && i.dataSet === tile.dataSet)) || tile;
536496
break;
537497
case "KR":
538498
default:

0 commit comments

Comments
 (0)