ol 10.1.1-dev.1726497766251 → 10.1.1-dev.1726748362724
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/View.js +3 -3
- package/dist/ol.js +1 -1
- package/dist/ol.js.map +1 -1
- package/package.json +1 -1
- package/source/DataTile.d.ts.map +1 -1
- package/source/DataTile.js +1 -9
- package/source/Tile.d.ts +1 -15
- package/source/Tile.d.ts.map +1 -1
- package/source/Tile.js +7 -26
- package/source/TileImage.d.ts.map +1 -1
- package/source/TileImage.js +4 -24
- package/source/UTFGrid.d.ts +0 -8
- package/source/UTFGrid.d.ts.map +1 -1
- package/source/UTFGrid.js +0 -20
- package/source/UrlTile.d.ts +0 -8
- package/source/UrlTile.d.ts.map +1 -1
- package/source/UrlTile.js +0 -17
- package/util.js +1 -1
package/package.json
CHANGED
package/source/DataTile.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DataTile.d.ts","sourceRoot":"","sources":["DataTile.js"],"names":[],"mappings":";mCAsBa,WAAW,GAAC,iBAAiB;;;;;YAK5B,WAAW;;;;;;;;;;;;;;;qBASZ,CAAS,IAAM,EAAN,MAAM,EAAE,IAAM,EAAN,MAAM,EAAE,IAAM,EAAN,MAAM,EAAE,IAAa,EAAb,aAAa,KAAI,CAAC,OAAO,gBAAgB,EAAE,IAAI,GAAC,OAAO,CAAC,OAAO,gBAAgB,EAAE,IAAI,CAAC,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAkBvH,OAAO,YAAY,EAAE,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAjCjD;;GAEG;AAEH;;;;;;GAMG;AAEH;;;;GAIG;AAEH;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AAEH;;;;;;;;GAQG;AACH,6BAJ6C,QAAQ,SAAxC,OAAQ,YAAY,EAAE,OAAQ;IAKzC;;OAEG;IACH,qBAFW,OAAO,EAsFjB;IAxDC;;;OAGG;IACH,gBAAgE;IAEhE;;;OAGG;IACH,kBAAmE;IAEnE;;;OAGG;IACH,mBAAsB;IAEtB;;;OAGG;IACH,yBAA0B;IAE1B;;OAEG;IACH,gBAA6B;
|
|
1
|
+
{"version":3,"file":"DataTile.d.ts","sourceRoot":"","sources":["DataTile.js"],"names":[],"mappings":";mCAsBa,WAAW,GAAC,iBAAiB;;;;;YAK5B,WAAW;;;;;;;;;;;;;;;qBASZ,CAAS,IAAM,EAAN,MAAM,EAAE,IAAM,EAAN,MAAM,EAAE,IAAM,EAAN,MAAM,EAAE,IAAa,EAAb,aAAa,KAAI,CAAC,OAAO,gBAAgB,EAAE,IAAI,GAAC,OAAO,CAAC,OAAO,gBAAgB,EAAE,IAAI,CAAC,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAkBvH,OAAO,YAAY,EAAE,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAjCjD;;GAEG;AAEH;;;;;;GAMG;AAEH;;;;GAIG;AAEH;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AAEH;;;;;;;;GAQG;AACH,6BAJ6C,QAAQ,SAAxC,OAAQ,YAAY,EAAE,OAAQ;IAKzC;;OAEG;IACH,qBAFW,OAAO,EAsFjB;IAxDC;;;OAGG;IACH,gBAAgE;IAEhE;;;OAGG;IACH,kBAAmE;IAEnE;;;OAGG;IACH,mBAAsB;IAEtB;;;OAGG;IACH,yBAA0B;IAE1B;;OAEG;IACH,gBAA6B;IAmN/B;;;OAGG;IACH,yBAFW,OAAO,oBAAoB,EAAE,OAAO,QAsB9C;IApOC;;OAEG;IACH,WAFU,MAAM,CAEwD;IAExE;;;OAGG;IACH,+BAAgC;IAEhC;;;OAGG;IACH,gCAAiC;IAEjC;;;OAGG;IACH,qBAAsD;IAGxD;;;;;OAKG;IACH,kCAFW,KAAK,CAAC,OAAO,YAAY,EAAE,IAAI,CAAC,QAI1C;IAED;;;;;;OAMG;IACH,yBAHW,MAAM,GACL,OAAO,YAAY,EAAE,IAAI,CAWpC;IAgBD;;;OAGG;IACH,4BAHW,MAAM,QAKhB;IAED;;;;;;;OAOG;IACH,kBAPW,MAAM,KACN,MAAM,KACN,MAAM,cACN,OAAO,uBAAuB,EAAE,OAAO,cACvC,OAAO,uBAAuB,EAAE,OAAO,GACrC,QAAQ,CAqDpB;IAoHD;;;;;;;;;;;OAWG;IACH,qCAJW,OAAO,YAAY,EAAE,cAAc,YACnC,OAAO,yBAAyB,EAAE,OAAO,QAWnD;CA2CF;qBAlcoB,gBAAgB;uBAKK,WAAW"}
|
package/source/DataTile.js
CHANGED
|
@@ -294,10 +294,6 @@ class DataTileSource extends TileSource {
|
|
|
294
294
|
}
|
|
295
295
|
|
|
296
296
|
const size = this.getTileSize(z);
|
|
297
|
-
const tileCoordKey = getKeyZXY(z, x, y);
|
|
298
|
-
if (this.tileCache.containsKey(tileCoordKey)) {
|
|
299
|
-
return this.tileCache.get(tileCoordKey);
|
|
300
|
-
}
|
|
301
297
|
|
|
302
298
|
const sourceLoader = this.loader_;
|
|
303
299
|
|
|
@@ -344,7 +340,6 @@ class DataTileSource extends TileSource {
|
|
|
344
340
|
tile.key = this.getKey();
|
|
345
341
|
tile.addEventListener(EventType.CHANGE, this.handleTileChange_);
|
|
346
342
|
|
|
347
|
-
this.tileCache.set(tileCoordKey, tile);
|
|
348
343
|
return tile;
|
|
349
344
|
}
|
|
350
345
|
|
|
@@ -423,7 +418,7 @@ class DataTileSource extends TileSource {
|
|
|
423
418
|
getTileCacheForProjection(projection) {
|
|
424
419
|
const thisProj = this.getProjection();
|
|
425
420
|
if (!thisProj || equivalent(thisProj, projection)) {
|
|
426
|
-
return
|
|
421
|
+
return super.getTileCacheForProjection(projection);
|
|
427
422
|
}
|
|
428
423
|
|
|
429
424
|
const projKey = getUid(projection);
|
|
@@ -441,9 +436,6 @@ class DataTileSource extends TileSource {
|
|
|
441
436
|
expireCache(projection, usedTiles) {
|
|
442
437
|
const usedTileCache = this.getTileCacheForProjection(projection);
|
|
443
438
|
|
|
444
|
-
this.tileCache.expireCache(
|
|
445
|
-
this.tileCache == usedTileCache ? usedTiles : {},
|
|
446
|
-
);
|
|
447
439
|
for (const id in this.tileCacheForProjection_) {
|
|
448
440
|
const tileCache = this.tileCacheForProjection_[id];
|
|
449
441
|
tileCache.expireCache(tileCache == usedTileCache ? usedTiles : {});
|
package/source/Tile.d.ts
CHANGED
|
@@ -134,11 +134,6 @@ declare class TileSource<TileType extends import("../Tile.js").default = import(
|
|
|
134
134
|
* @protected
|
|
135
135
|
*/
|
|
136
136
|
protected tileGrid: import("../tilegrid/TileGrid.js").default | null;
|
|
137
|
-
/**
|
|
138
|
-
* @protected
|
|
139
|
-
* @type {import("../TileCache.js").default}
|
|
140
|
-
*/
|
|
141
|
-
protected tileCache: import("../TileCache.js").default;
|
|
142
137
|
/**
|
|
143
138
|
* @protected
|
|
144
139
|
* @type {import("../size.js").Size}
|
|
@@ -242,19 +237,10 @@ declare class TileSource<TileType extends import("../Tile.js").default = import(
|
|
|
242
237
|
*/
|
|
243
238
|
getTileCoordForTileUrlFunction(tileCoord: import("../tilecoord.js").TileCoord, projection?: import("../proj.js").Projection | undefined): import("../tilecoord.js").TileCoord;
|
|
244
239
|
/**
|
|
245
|
-
* Remove all cached tiles from the source. The next render cycle will
|
|
240
|
+
* Remove all cached reprojected tiles from the source. The next render cycle will create new tiles.
|
|
246
241
|
* @api
|
|
247
242
|
*/
|
|
248
243
|
clear(): void;
|
|
249
|
-
/**
|
|
250
|
-
* Marks a tile coord as being used, without triggering a load.
|
|
251
|
-
* @abstract
|
|
252
|
-
* @param {number} z Tile coordinate z.
|
|
253
|
-
* @param {number} x Tile coordinate x.
|
|
254
|
-
* @param {number} y Tile coordinate y.
|
|
255
|
-
* @param {import("../proj/Projection.js").default} projection Projection.
|
|
256
|
-
*/
|
|
257
|
-
useTile(z: number, x: number, y: number, projection: import("../proj/Projection.js").default): void;
|
|
258
244
|
}
|
|
259
245
|
import Source from './Source.js';
|
|
260
246
|
//# sourceMappingURL=Tile.d.ts.map
|
package/source/Tile.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Tile.d.ts","sourceRoot":"","sources":["Tile.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Tile.d.ts","sourceRoot":"","sources":["Tile.js"],"names":[],"mappings":"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"}
|
package/source/Tile.js
CHANGED
|
@@ -3,8 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
import Event from '../events/Event.js';
|
|
5
5
|
import Source from './Source.js';
|
|
6
|
-
import
|
|
7
|
-
import {abstract} from '../util.js';
|
|
6
|
+
import {abstract, getUid} from '../util.js';
|
|
8
7
|
import {assert} from '../asserts.js';
|
|
9
8
|
import {equivalent} from '../proj.js';
|
|
10
9
|
import {
|
|
@@ -97,12 +96,6 @@ class TileSource extends Source {
|
|
|
97
96
|
toSize(this.tileGrid.getTileSize(this.tileGrid.getMinZoom()), tileSize);
|
|
98
97
|
}
|
|
99
98
|
|
|
100
|
-
/**
|
|
101
|
-
* @protected
|
|
102
|
-
* @type {import("../TileCache.js").default}
|
|
103
|
-
*/
|
|
104
|
-
this.tileCache = new TileCache(options.cacheSize || 0);
|
|
105
|
-
|
|
106
99
|
/**
|
|
107
100
|
* @protected
|
|
108
101
|
* @type {import("../size.js").Size}
|
|
@@ -113,7 +106,7 @@ class TileSource extends Source {
|
|
|
113
106
|
* @private
|
|
114
107
|
* @type {string}
|
|
115
108
|
*/
|
|
116
|
-
this.key_ = options.key ||
|
|
109
|
+
this.key_ = options.key || getUid(this);
|
|
117
110
|
|
|
118
111
|
/**
|
|
119
112
|
* @protected
|
|
@@ -138,7 +131,7 @@ class TileSource extends Source {
|
|
|
138
131
|
* @return {boolean} Can expire cache.
|
|
139
132
|
*/
|
|
140
133
|
canExpireCache() {
|
|
141
|
-
return
|
|
134
|
+
return false;
|
|
142
135
|
}
|
|
143
136
|
|
|
144
137
|
/**
|
|
@@ -237,9 +230,9 @@ class TileSource extends Source {
|
|
|
237
230
|
const sourceProjection = this.getProjection();
|
|
238
231
|
assert(
|
|
239
232
|
sourceProjection === null || equivalent(sourceProjection, projection),
|
|
240
|
-
|
|
233
|
+
"Use the renderer's tile cache when not reprojecting.",
|
|
241
234
|
);
|
|
242
|
-
return
|
|
235
|
+
return null;
|
|
243
236
|
}
|
|
244
237
|
|
|
245
238
|
/**
|
|
@@ -288,12 +281,10 @@ class TileSource extends Source {
|
|
|
288
281
|
}
|
|
289
282
|
|
|
290
283
|
/**
|
|
291
|
-
* Remove all cached tiles from the source. The next render cycle will
|
|
284
|
+
* Remove all cached reprojected tiles from the source. The next render cycle will create new tiles.
|
|
292
285
|
* @api
|
|
293
286
|
*/
|
|
294
|
-
clear() {
|
|
295
|
-
this.tileCache.clear();
|
|
296
|
-
}
|
|
287
|
+
clear() {}
|
|
297
288
|
|
|
298
289
|
/**
|
|
299
290
|
* @override
|
|
@@ -302,16 +293,6 @@ class TileSource extends Source {
|
|
|
302
293
|
this.clear();
|
|
303
294
|
super.refresh();
|
|
304
295
|
}
|
|
305
|
-
|
|
306
|
-
/**
|
|
307
|
-
* Marks a tile coord as being used, without triggering a load.
|
|
308
|
-
* @abstract
|
|
309
|
-
* @param {number} z Tile coordinate z.
|
|
310
|
-
* @param {number} x Tile coordinate x.
|
|
311
|
-
* @param {number} y Tile coordinate y.
|
|
312
|
-
* @param {import("../proj/Projection.js").default} projection Projection.
|
|
313
|
-
*/
|
|
314
|
-
useTile(z, x, y, projection) {}
|
|
315
296
|
}
|
|
316
297
|
|
|
317
298
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TileImage.d.ts","sourceRoot":"","sources":["TileImage.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAwBc,OAAO,YAAY,EAAE,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAVjD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2CG;AAEH;;;;;GAKG;AACH;IACE;;OAEG;IACH,qBAFY,OAAO,EA8DlB;IArCC;;;OAGG;IACH,uBAFW,MAAM,OAAA,CAG+C;IAEhE;;;OAGG;IACH,qBAFU,OAAO,SAAS,CAGuC;IAEjE;;;OAGG;IACH,kCAFU;YAAQ,MAAM,GAAE,SAAS;KAAC,CAEJ;IAEhC;;;OAGG;IACH,iCAFU;YAAQ,MAAM,GAAE,OAAO,yBAAyB,EAAE,OAAO;KAAC,CAErC;IAE/B;;;OAGG;IACH,oCAAqE;IAErE;;;OAGG;IACH,iCAAqC;
|
|
1
|
+
{"version":3,"file":"TileImage.d.ts","sourceRoot":"","sources":["TileImage.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAwBc,OAAO,YAAY,EAAE,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAVjD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2CG;AAEH;;;;;GAKG;AACH;IACE;;OAEG;IACH,qBAFY,OAAO,EA8DlB;IArCC;;;OAGG;IACH,uBAFW,MAAM,OAAA,CAG+C;IAEhE;;;OAGG;IACH,qBAFU,OAAO,SAAS,CAGuC;IAEjE;;;OAGG;IACH,kCAFU;YAAQ,MAAM,GAAE,SAAS;KAAC,CAEJ;IAEhC;;;OAGG;IACH,iCAFU;YAAQ,MAAM,GAAE,OAAO,yBAAyB,EAAE,OAAO;KAAC,CAErC;IAE/B;;;OAGG;IACH,oCAAqE;IAErE;;;OAGG;IACH,iCAAqC;IA+CvC;;OAEG;IACH,aAFY,MAAM,CAIjB;IAkDD;;;;;;;;;OASG;IACH,oBAoBC;IAED;;;;;;;;OAQG;IACH,oBARW,MAAM,KACN,MAAM,KACN,MAAM,cACN,MAAM,cACN,OAAO,uBAAuB,EAAE,OAAO,GACtC,CAAE,SAAS,GAAC,UAAU,CAAC,CA0DlC;IAED;;;;;;;;OAQG;IACH,6BARW,MAAM,KACN,MAAM,KACN,MAAM,cACN,MAAM,cACN,OAAQ,uBAAuB,EAAE,OAAO,GACtC,SAAS,CAMrB;IAED;;;;OAIG;IACH,mCAHW,OAAO,QAYjB;IAED;;;;;;;;;;;OAWG;IACH,qCAJW,OAAO,YAAY,EAAE,cAAc,YACnC,OAAO,yBAAyB,EAAE,OAAO,QAWnD;CAWF;sBAjYqB,iBAAiB;oBAInB,cAAc;sBAFZ,iBAAiB;uBADhB,mBAAmB"}
|
package/source/TileImage.js
CHANGED
|
@@ -8,7 +8,7 @@ import TileCache from '../TileCache.js';
|
|
|
8
8
|
import TileState from '../TileState.js';
|
|
9
9
|
import UrlTile from './UrlTile.js';
|
|
10
10
|
import {equivalent, get as getProjection} from '../proj.js';
|
|
11
|
-
import {getKey
|
|
11
|
+
import {getKey} from '../tilecoord.js';
|
|
12
12
|
import {getForProjection as getTileGridForProjection} from '../tilegrid.js';
|
|
13
13
|
import {getUid} from '../util.js';
|
|
14
14
|
|
|
@@ -134,9 +134,6 @@ class TileImage extends UrlTile {
|
|
|
134
134
|
* @override
|
|
135
135
|
*/
|
|
136
136
|
canExpireCache() {
|
|
137
|
-
if (this.tileCache.canExpireCache()) {
|
|
138
|
-
return true;
|
|
139
|
-
}
|
|
140
137
|
for (const key in this.tileCacheForProjection) {
|
|
141
138
|
if (this.tileCacheForProjection[key].canExpireCache()) {
|
|
142
139
|
return true;
|
|
@@ -154,9 +151,6 @@ class TileImage extends UrlTile {
|
|
|
154
151
|
expireCache(projection, usedTiles) {
|
|
155
152
|
const usedTileCache = this.getTileCacheForProjection(projection);
|
|
156
153
|
|
|
157
|
-
this.tileCache.expireCache(
|
|
158
|
-
this.tileCache == usedTileCache ? usedTiles : {},
|
|
159
|
-
);
|
|
160
154
|
for (const id in this.tileCacheForProjection) {
|
|
161
155
|
const tileCache = this.tileCacheForProjection[id];
|
|
162
156
|
tileCache.expireCache(tileCache == usedTileCache ? usedTiles : {});
|
|
@@ -225,13 +219,11 @@ class TileImage extends UrlTile {
|
|
|
225
219
|
getTileCacheForProjection(projection) {
|
|
226
220
|
const thisProj = this.getProjection();
|
|
227
221
|
if (!thisProj || equivalent(thisProj, projection)) {
|
|
228
|
-
return
|
|
222
|
+
return super.getTileCacheForProjection(projection);
|
|
229
223
|
}
|
|
230
224
|
const projKey = getUid(projection);
|
|
231
225
|
if (!(projKey in this.tileCacheForProjection)) {
|
|
232
|
-
this.tileCacheForProjection[projKey] = new TileCache(
|
|
233
|
-
this.tileCache.highWaterMark,
|
|
234
|
-
);
|
|
226
|
+
this.tileCacheForProjection[projKey] = new TileCache(512);
|
|
235
227
|
}
|
|
236
228
|
return this.tileCacheForProjection[projKey];
|
|
237
229
|
}
|
|
@@ -344,20 +336,8 @@ class TileImage extends UrlTile {
|
|
|
344
336
|
* @protected
|
|
345
337
|
*/
|
|
346
338
|
getTileInternal(z, x, y, pixelRatio, projection) {
|
|
347
|
-
const tileCoordKey = getKeyZXY(z, x, y);
|
|
348
339
|
const key = this.getKey();
|
|
349
|
-
|
|
350
|
-
const tile = this.createTile_(z, x, y, pixelRatio, projection, key);
|
|
351
|
-
this.tileCache.set(tileCoordKey, tile);
|
|
352
|
-
return tile;
|
|
353
|
-
}
|
|
354
|
-
|
|
355
|
-
let tile = this.tileCache.get(tileCoordKey);
|
|
356
|
-
if (tile.key != key) {
|
|
357
|
-
tile = this.createTile_(z, x, y, pixelRatio, projection, key);
|
|
358
|
-
this.tileCache.replace(tileCoordKey, tile);
|
|
359
|
-
}
|
|
360
|
-
return tile;
|
|
340
|
+
return this.createTile_(z, x, y, pixelRatio, projection, key);
|
|
361
341
|
}
|
|
362
342
|
|
|
363
343
|
/**
|
package/source/UTFGrid.d.ts
CHANGED
|
@@ -242,14 +242,6 @@ declare class UTFGrid extends TileSource<Tile> {
|
|
|
242
242
|
* @override
|
|
243
243
|
*/
|
|
244
244
|
override getTile(z: number, x: number, y: number, pixelRatio: number, projection: import("../proj/Projection.js").default): CustomTile;
|
|
245
|
-
/**
|
|
246
|
-
* Marks a tile coord as being used, without triggering a load.
|
|
247
|
-
* @param {number} z Tile coordinate z.
|
|
248
|
-
* @param {number} x Tile coordinate x.
|
|
249
|
-
* @param {number} y Tile coordinate y.
|
|
250
|
-
* @override
|
|
251
|
-
*/
|
|
252
|
-
override useTile(z: number, x: number, y: number): void;
|
|
253
245
|
}
|
|
254
246
|
import TileSource from './Tile.js';
|
|
255
247
|
//# sourceMappingURL=UTFGrid.d.ts.map
|
package/source/UTFGrid.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UTFGrid.d.ts","sourceRoot":"","sources":["UTFGrid.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"UTFGrid.d.ts","sourceRoot":"","sources":["UTFGrid.js"],"names":[],"mappings":"AAeA;;;;;GAKG;AAEH;IACE;;;;;;;OAOG;IACH,uBAPW,OAAO,iBAAiB,EAAE,SAAS,SACnC,GAAiC,OACjC,MAAM,UACN,OAAO,cAAc,EAAE,MAAM,cAC7B,OAAO,SACP,OAAO,EA8CjB;IAzCC;;;OAGG;IACH,aAAe;IAEf;;;OAGG;IACH,gBAAqB;IAErB;;;OAGG;IACH,oBAA6B;IAE7B;;;OAGG;IACH,cAAiB;IAEjB;;;OAGG;IACH,cAAiB;IAEjB;;;OAGG;IACH,cAAiB;IAEjB;;;OAGG;IACH,eAAmB;IAGrB;;;OAGG;IACH,YAFY,gBAAgB,CAI3B;IAED;;;;OAIG;IACH,oBAHW,OAAO,kBAAkB,EAAE,UAAU,GACpC,GAAC,CAoCZ;IAED;;;;;;;OAOG;IACH,gCALW,OAAO,kBAAkB,EAAE,UAAU,YACrC,CAAS,IAAC,EAAD,GAAC,KAAG,IAAI,uCAoB3B;IAWD;;OAEG;IACH,qBAGC;IAED;;;OAGG;IACH,oBAOC;IAED;;OAEG;IACH,sBAiBC;IAED;;;OAGG;IACH,mBAiBC;IAED;;;OAGG;IACH,oBAEC;CAYF;;;;;;UApOa,KAAK,CAAC,MAAM,CAAC;;;;UACb,KAAK,CAAC,MAAM,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAbV,YAAY;AAkP7B;;;;;;;;;;;;;;;;;;GAkBG;AAEH;;;;GAIG;AACH;IACE;;OAEG;IACH,qBAFW,OAAO,EAsDjB;IA5CC;;;OAGG;IACH,oBAC8D;IAE9D;;;OAGG;IACH,yBAA2C;IAE3C;;;OAGG;IACH,kBAA0B;IAE1B;;;OAGG;IACH,eAAoC;IAuBtC;;;OAGG;IACH,mBAiBC;IAED;;;OAGG;IACH,oBAEC;IAED;;;;OAIG;IACH,eAHY,MAAM,GAAC,SAAS,CAK3B;IAED;;;;;;;;;;OAUG;IACH,6CAPW,OAAO,kBAAkB,EAAE,UAAU,cACrC,MAAM,YACN,CAAS,IAAC,EAAD,GAAC,KAAG,IAAI,uCA4B3B;IAED;;OAEG;IACH,sCAEC;IAED;;;;OAIG;IACH,2CAFW,OAAO,eAAe,EAAE,MAAM,QA8CxC;IAED;;;;;;;;OAQG;IACH,oBARW,MAAM,KACN,MAAM,KACN,MAAM,cACN,MAAM,cACN,OAAO,uBAAuB,EAAE,OAAO,GACrC,UAAU,CAmBtB;CACF;uBApesB,WAAW"}
|
package/source/UTFGrid.js
CHANGED
|
@@ -9,7 +9,6 @@ import TileState from '../TileState.js';
|
|
|
9
9
|
import {applyTransform, intersects} from '../extent.js';
|
|
10
10
|
import {createFromTemplates, nullTileUrlFunction} from '../tileurlfunction.js';
|
|
11
11
|
import {createXYZ, extentFromProjection} from '../tilegrid.js';
|
|
12
|
-
import {getKeyZXY} from '../tilecoord.js';
|
|
13
12
|
import {get as getProjection, getTransformFromProjections} from '../proj.js';
|
|
14
13
|
import {listenOnce} from '../events.js';
|
|
15
14
|
import {jsonp as requestJSONP} from '../net.js';
|
|
@@ -473,10 +472,6 @@ class UTFGrid extends TileSource {
|
|
|
473
472
|
* @override
|
|
474
473
|
*/
|
|
475
474
|
getTile(z, x, y, pixelRatio, projection) {
|
|
476
|
-
const tileCoordKey = getKeyZXY(z, x, y);
|
|
477
|
-
if (this.tileCache.containsKey(tileCoordKey)) {
|
|
478
|
-
return this.tileCache.get(tileCoordKey);
|
|
479
|
-
}
|
|
480
475
|
const tileCoord = [z, x, y];
|
|
481
476
|
const urlTileCoord = this.getTileCoordForTileUrlFunction(
|
|
482
477
|
tileCoord,
|
|
@@ -491,23 +486,8 @@ class UTFGrid extends TileSource {
|
|
|
491
486
|
this.preemptive_,
|
|
492
487
|
this.jsonp_,
|
|
493
488
|
);
|
|
494
|
-
this.tileCache.set(tileCoordKey, tile);
|
|
495
489
|
return tile;
|
|
496
490
|
}
|
|
497
|
-
|
|
498
|
-
/**
|
|
499
|
-
* Marks a tile coord as being used, without triggering a load.
|
|
500
|
-
* @param {number} z Tile coordinate z.
|
|
501
|
-
* @param {number} x Tile coordinate x.
|
|
502
|
-
* @param {number} y Tile coordinate y.
|
|
503
|
-
* @override
|
|
504
|
-
*/
|
|
505
|
-
useTile(z, x, y) {
|
|
506
|
-
const tileCoordKey = getKeyZXY(z, x, y);
|
|
507
|
-
if (this.tileCache.containsKey(tileCoordKey)) {
|
|
508
|
-
this.tileCache.get(tileCoordKey);
|
|
509
|
-
}
|
|
510
|
-
}
|
|
511
491
|
}
|
|
512
492
|
|
|
513
493
|
export default UTFGrid;
|
package/source/UrlTile.d.ts
CHANGED
|
@@ -182,14 +182,6 @@ declare class UrlTile extends TileSource<import("../Tile.js").default> {
|
|
|
182
182
|
* @api
|
|
183
183
|
*/
|
|
184
184
|
setUrls(urls: Array<string>): void;
|
|
185
|
-
/**
|
|
186
|
-
* Marks a tile coord as being used, without triggering a load.
|
|
187
|
-
* @param {number} z Tile coordinate z.
|
|
188
|
-
* @param {number} x Tile coordinate x.
|
|
189
|
-
* @param {number} y Tile coordinate y.
|
|
190
|
-
* @override
|
|
191
|
-
*/
|
|
192
|
-
override useTile(z: number, x: number, y: number): void;
|
|
193
185
|
}
|
|
194
186
|
import TileSource from './Tile.js';
|
|
195
187
|
//# sourceMappingURL=UrlTile.d.ts.map
|
package/source/UrlTile.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UrlTile.d.ts","sourceRoot":"","sources":["UrlTile.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"UrlTile.d.ts","sourceRoot":"","sources":["UrlTile.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;iBAec,OAAO,YAAY,EAAE,cAAc;;;;;;;;;;;;sBAGnC,OAAO,YAAY,EAAE,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAR/C;;;;;;;;;;;;;;;;;;;;GAoBG;AAEH;;;;GAIG;AACH;IACE;;OAEG;IACH,qBAFW,OAAO,EAoDjB;IAlCC;;;OAGG;IACH,iCAC4D;IAE5D;;;OAGG;IACH,4BAFU,OAAO,YAAY,EAAE,YAAY,CAEK;IA4IlD;;;;;OAKG;IACH,2BALW,OAAO,iBAAiB,EAAE,SAAS,cACnC,MAAM,cACN,OAAO,uBAAuB,EAAE,OAAO,GACtC,MAAM,GAAC,SAAS,CAI3B;IA9IC;;;OAGG;IACH,gBAFW,KAAK,CAAC,MAAM,CAAC,GAAC,IAAI,CAEb;IAQhB;;;OAGG;IACH,yBAA0B;IAG5B;;;;;OAKG;IACH,uBAHY,OAAO,YAAY,EAAE,YAAY,CAK5C;IAED;;;;;OAKG;IACH,sBAHY,OAAO,YAAY,EAAE,WAAW,CAO3C;IAED;;;;;;;OAOG;IACH,WAHa,KAAK,CAAC,MAAM,CAAC,GAAC,IAAI,CAK9B;IAED;;;;OAIG;IACH,kCAHW,OAAO,oBAAoB,EAAE,OAAO,QAuB9C;IAED;;;;;OAKG;IACH,sCAHW,OAAO,YAAY,EAAE,YAAY,QAM3C;IAED;;;;;;OAMG;IACH,oCAJW,OAAO,YAAY,EAAE,WAAW,kCAW1C;IAED;;;;OAIG;IACH,YAHW,MAAM,QAOhB;IAED;;;;;OAKG;IACH,cAHW,KAAK,CAAC,MAAM,CAAC,QAWvB;CAWF;uBArNyC,WAAW"}
|
package/source/UrlTile.js
CHANGED
|
@@ -6,7 +6,6 @@ import TileSource, {TileSourceEvent} from './Tile.js';
|
|
|
6
6
|
import TileState from '../TileState.js';
|
|
7
7
|
import {createFromTemplates} from '../tileurlfunction.js';
|
|
8
8
|
import {expandUrl} from '../uri.js';
|
|
9
|
-
import {getKeyZXY} from '../tilecoord.js';
|
|
10
9
|
import {getUid} from '../util.js';
|
|
11
10
|
|
|
12
11
|
/**
|
|
@@ -160,7 +159,6 @@ class UrlTile extends TileSource {
|
|
|
160
159
|
* @api
|
|
161
160
|
*/
|
|
162
161
|
setTileLoadFunction(tileLoadFunction) {
|
|
163
|
-
this.tileCache.clear();
|
|
164
162
|
this.tileLoadFunction = tileLoadFunction;
|
|
165
163
|
this.changed();
|
|
166
164
|
}
|
|
@@ -174,7 +172,6 @@ class UrlTile extends TileSource {
|
|
|
174
172
|
*/
|
|
175
173
|
setTileUrlFunction(tileUrlFunction, key) {
|
|
176
174
|
this.tileUrlFunction = tileUrlFunction;
|
|
177
|
-
this.tileCache.pruneExceptNewestZ();
|
|
178
175
|
if (typeof key !== 'undefined') {
|
|
179
176
|
this.setKey(key);
|
|
180
177
|
} else {
|
|
@@ -218,20 +215,6 @@ class UrlTile extends TileSource {
|
|
|
218
215
|
tileUrlFunction(tileCoord, pixelRatio, projection) {
|
|
219
216
|
return undefined;
|
|
220
217
|
}
|
|
221
|
-
|
|
222
|
-
/**
|
|
223
|
-
* Marks a tile coord as being used, without triggering a load.
|
|
224
|
-
* @param {number} z Tile coordinate z.
|
|
225
|
-
* @param {number} x Tile coordinate x.
|
|
226
|
-
* @param {number} y Tile coordinate y.
|
|
227
|
-
* @override
|
|
228
|
-
*/
|
|
229
|
-
useTile(z, x, y) {
|
|
230
|
-
const tileCoordKey = getKeyZXY(z, x, y);
|
|
231
|
-
if (this.tileCache.containsKey(tileCoordKey)) {
|
|
232
|
-
this.tileCache.get(tileCoordKey);
|
|
233
|
-
}
|
|
234
|
-
}
|
|
235
218
|
}
|
|
236
219
|
|
|
237
220
|
export default UrlTile;
|
package/util.js
CHANGED