Skip to content

Commit 1b7b20a

Browse files
VirgilClyneVirgilClyne
committed
fix: GEOResourceManifest 类 tileSets 重复筛选
Update GEOResourceManifest.mjs
1 parent 0564ec6 commit 1b7b20a

File tree

1 file changed

+9
-53
lines changed

1 file changed

+9
-53
lines changed

‎src/class/GEOResourceManifest.mjs‎

Lines changed: 9 additions & 53 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
*/
@@ -111,16 +111,10 @@ export default class GEOResourceManifest {
111111
case "XX":
112112
switch (typeof tile.dataSet) {
113113
case "undefined":
114-
tile =
115-
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.size === tile.size) ||
116-
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.size === tile.size) ||
117-
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale) ||
118-
caches?.XX?.tileSet?.find(i => i.style === tile.style) ||
119-
tile;
114+
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;
120115
break;
121116
case "number":
122117
tile =
123-
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.size === tile.size && i.dataSet === tile.dataSet) ||
124118
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.size === tile.size && i.dataSet === tile.dataSet) ||
125119
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.dataSet === tile.dataSet) ||
126120
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.dataSet === tile.dataSet) ||
@@ -154,15 +148,13 @@ export default class GEOResourceManifest {
154148
switch (typeof tile.dataSet) {
155149
case "undefined":
156150
tile =
157-
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.size === tile.size) ||
158151
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.size === tile.size) ||
159152
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale) ||
160153
caches?.XX?.tileSet?.find(i => i.style === tile.style) ||
161154
tile;
162155
break;
163156
case "number":
164157
tile =
165-
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.size === tile.size && i.dataSet === tile.dataSet) ||
166158
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.size === tile.size && i.dataSet === tile.dataSet) ||
167159
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.dataSet === tile.dataSet) ||
168160
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.dataSet === tile.dataSet) ||
@@ -194,15 +186,13 @@ export default class GEOResourceManifest {
194186
switch (typeof tile.dataSet) {
195187
case "undefined":
196188
tile =
197-
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.size === tile.size) ||
198189
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.size === tile.size) ||
199190
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale) ||
200191
caches?.XX?.tileSet?.find(i => i.style === tile.style) ||
201192
tile;
202193
break;
203194
case "number":
204195
tile =
205-
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.size === tile.size && i.dataSet === tile.dataSet) ||
206196
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.size === tile.size && i.dataSet === tile.dataSet) ||
207197
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.dataSet === tile.dataSet) ||
208198
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.dataSet === tile.dataSet) ||
@@ -231,15 +221,13 @@ export default class GEOResourceManifest {
231221
switch (typeof tile.dataSet) {
232222
case "undefined":
233223
tile =
234-
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.size === tile.size) ||
235224
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.size === tile.size) ||
236225
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale) ||
237226
caches?.XX?.tileSet?.find(i => i.style === tile.style) ||
238227
tile;
239228
break;
240229
case "number":
241230
tile =
242-
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.size === tile.size && i.dataSet === tile.dataSet) ||
243231
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.size === tile.size && i.dataSet === tile.dataSet) ||
244232
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.dataSet === tile.dataSet) ||
245233
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.dataSet === tile.dataSet) ||
@@ -265,15 +253,13 @@ export default class GEOResourceManifest {
265253
switch (typeof tile.dataSet) {
266254
case "undefined":
267255
tile =
268-
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.size === tile.size) ||
269256
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.size === tile.size) ||
270257
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale) ||
271258
caches?.XX?.tileSet?.find(i => i.style === tile.style) ||
272259
tile;
273260
break;
274261
case "number":
275262
tile =
276-
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.size === tile.size && i.dataSet === tile.dataSet) ||
277263
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.size === tile.size && i.dataSet === tile.dataSet) ||
278264
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.dataSet === tile.dataSet) ||
279265
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.dataSet === tile.dataSet) ||
@@ -300,16 +286,10 @@ export default class GEOResourceManifest {
300286
default:
301287
switch (typeof tile.dataSet) {
302288
case "undefined":
303-
tile =
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 && i.size === tile.size) ||
306-
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale) ||
307-
caches?.XX?.tileSet?.find(i => i.style === tile.style) ||
308-
tile;
289+
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;
309290
break;
310291
case "number":
311292
tile =
312-
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.size === tile.size && i.dataSet === tile.dataSet) ||
313293
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.size === tile.size && i.dataSet === tile.dataSet) ||
314294
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.dataSet === tile.dataSet) ||
315295
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.dataSet === tile.dataSet) ||
@@ -334,16 +314,10 @@ export default class GEOResourceManifest {
334314
default:
335315
switch (typeof tile.dataSet) {
336316
case "undefined":
337-
tile =
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 && i.size === tile.size) ||
340-
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale) ||
341-
caches?.XX?.tileSet?.find(i => i.style === tile.style) ||
342-
tile;
317+
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;
343318
break;
344319
case "number":
345320
tile =
346-
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.size === tile.size && i.dataSet === tile.dataSet) ||
347321
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.size === tile.size && i.dataSet === tile.dataSet) ||
348322
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.dataSet === tile.dataSet) ||
349323
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.dataSet === tile.dataSet) ||
@@ -367,16 +341,10 @@ export default class GEOResourceManifest {
367341
default:
368342
switch (typeof tile.dataSet) {
369343
case "undefined":
370-
tile =
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 && i.size === tile.size) ||
373-
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale) ||
374-
caches?.XX?.tileSet?.find(i => i.style === tile.style) ||
375-
tile;
344+
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;
376345
break;
377346
case "number":
378347
tile =
379-
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.size === tile.size && i.dataSet === tile.dataSet) ||
380348
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.size === tile.size && i.dataSet === tile.dataSet) ||
381349
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.dataSet === tile.dataSet) ||
382350
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.dataSet === tile.dataSet) ||
@@ -399,16 +367,10 @@ export default class GEOResourceManifest {
399367
default:
400368
switch (typeof tile.dataSet) {
401369
case "undefined":
402-
tile =
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 && i.size === tile.size) ||
405-
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale) ||
406-
caches?.XX?.tileSet?.find(i => i.style === tile.style) ||
407-
tile;
370+
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;
408371
break;
409372
case "number":
410373
tile =
411-
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.size === tile.size && i.dataSet === tile.dataSet) ||
412374
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.size === tile.size && i.dataSet === tile.dataSet) ||
413375
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.dataSet === tile.dataSet) ||
414376
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.dataSet === tile.dataSet) ||
@@ -471,16 +433,10 @@ export default class GEOResourceManifest {
471433
case "Apple":
472434
switch (typeof tile.dataSet) {
473435
case "undefined":
474-
tile =
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 && i.size === tile.size) ||
477-
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale) ||
478-
caches?.XX?.tileSet?.find(i => i.style === tile.style) ||
479-
tile;
436+
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;
480437
break;
481438
case "number":
482439
tile =
483-
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.size === tile.size && i.dataSet === tile.dataSet) ||
484440
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.size === tile.size && i.dataSet === tile.dataSet) ||
485441
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.scale === tile.scale && i.dataSet === tile.dataSet) ||
486442
caches?.XX?.tileSet?.find(i => i.style === tile.style && i.dataSet === tile.dataSet) ||
@@ -508,7 +464,7 @@ export default class GEOResourceManifest {
508464
case "VECTOR_ROAD_SELECTION": // 87 道路选区?
509465
case "VECTOR_REGION_METADATA": // 88 区域元数据?
510466
Console.info(`TEST style: ${tile?.style}`);
511-
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;
467+
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;
512468
Console.info(`TEST baseURL: ${tile?.baseURL}`);
513469
break;
514470
*/
@@ -533,7 +489,7 @@ export default class GEOResourceManifest {
533489
/*
534490
switch (countryCode) {
535491
case "CN":
536-
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;
492+
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;
537493
break;
538494
case "KR":
539495
default:

0 commit comments

Comments
 (0)