ol 10.2.1-dev.1727272971398 → 10.2.1-dev.1727375784775
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/ol.js +1 -1
- package/dist/ol.js.map +1 -1
- package/package.json +1 -1
- package/renderer/webgl/TileLayerBase.d.ts.map +1 -1
- package/renderer/webgl/TileLayerBase.js +0 -18
- package/source/DataTile.d.ts +0 -5
- package/source/DataTile.d.ts.map +1 -1
- package/source/DataTile.js +3 -62
- package/source/Tile.d.ts +0 -17
- package/source/Tile.d.ts.map +1 -1
- package/source/Tile.js +0 -34
- package/source/TileImage.d.ts +0 -8
- package/source/TileImage.d.ts.map +1 -1
- package/source/TileImage.js +3 -84
- package/util.js +1 -1
package/package.json
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TileLayerBase.d.ts","sourceRoot":"","sources":["TileLayerBase.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"TileLayerBase.d.ts","sourceRoot":"","sources":["TileLayerBase.js"],"names":[],"mappings":"AAkDA;;GAEG;AACH;;;;GAIG;AAEH;;GAEG;AACH,+CAFY,wBAAwB,CAInC;AA0DD,iEAEC;;;;;;;;;;;;;;yCAzEY,OAAO,uCAAuC,EAAE,OAAO,CAAC,OAAO,eAAe,EAAE,OAAO,CAAC;;;;;aAIvF,GAAG,CAAC,MAAM,CAAC;;;;wBACX;YAAO,MAAM,GAAE,GAAG,CAAC,0BAA0B,CAAC;KAAC;;;;;;;;;;;;;;;;;;;4BA+EhD,mDAAyC;AATtD;;;;;;GAMG;AAEH;;GAEG;AAEH;;;;;;;GAOG;AACH,yCAL6B,SAAS,SAAxB,aAAc,EACmB,QAAQ,SAA1C,OAAQ,eAAe,EAAE,OAAQ,EACmC,kBAAkB,SAAtF,OAAQ,uCAAuC,EAAE,OAAO,CAAC,QAAQ,CAAE;IAI9E;;;OAGG;IACH,uBAHW,SAAS,WACT,OAAO,EA+DjB;IAvDC;;;OAGG;IACH,gBAFU,OAAO,CAEU;IAE3B;;;;OAIG;IACH,uBAAuC;IAEvC;;;OAGG;IACH,oBAHU,KAAK,CAAC,MAAM,CAAC,CAGK;IAE5B;;;OAGG;IACH,uBAA+C;IAE/C;;;OAGG;IACH,uBAA8C;IAE9C;;;OAGG;IACH,kBAAuB;IAGvB;;;OAGG;IACH,mCAHU,OAAO,2BAA2B,EAAE,OAAO,CAAC,kBAAkB,CAAC,CAGnB;IAEtD;;;OAGG;IACH,sBAFU,OAAO,cAAc,EAAE,UAAU,GAAC,IAAI,CAE1B;IAEtB;;;OAGG;IACH,4BAAoC;IAGtC;;;OAGG;IACH,wBAHW,OAAO,QAOjB;IA4BD;;;;;OAKG;IACH,4CAJW,OAAO,uCAAuC,EAAE,yBAAyB,CAAC,QAAQ,CAAC,GAClF,kBAAkB,CAK7B;IAED;;;;;;OAMG;IACH,yBANW,OAAO,cAAc,EAAE,UAAU,UACjC,OAAO,iBAAiB,EAAE,MAAM,YAChC,MAAM,4BACN,wBAAwB,WACxB,MAAM,QAqHhB;IAED;;;;OAIG;IACH,wCAJW,OAAO,cAAc,EAAE,UAAU,kBACjC,OAAO,QAKjB;IAED;;;;OAIG;IACH,4CAJW,OAAO,cAAc,EAAE,UAAU,GAChC,OAAO,CAKlB;IAED;;;;;;;;;;;;;OAaG;IACH,yCAbW,kBAAkB,iBAClB,OAAO,oBAAoB,EAAE,SAAS,cACtC,OAAO,cAAc,EAAE,UAAU,gBACjC,OAAO,iBAAiB,EAAE,MAAM,kBAChC,MAAM,YACN,OAAO,eAAe,EAAE,IAAI,cAC5B,OAAO,qBAAqB,EAAE,UAAU,cACxC,OAAO,iBAAiB,EAAE,MAAM,SAChC,MAAM,UACN,MAAM,SACN,MAAM,QAeb;IAEJ;;;;;;OAMG;IACH,6CANW,kBAAkB,SAClB,MAAM,UACN,OAAO,iBAAiB,EAAE,MAAM,SAChC,MAAM,QAG0C;IAE3D,iIAuEC;IAED;;;;;OAKG;IACH,iCAJW,OAAO,cAAc,EAAE,UAAU,GAChC,WAAW,CA6MtB;IAED;;;OAGG;IACH,qCAHW,OAAO,cAAc,EAAE,UAAU,QAK3C;IAED;;;;;;;;;;OAUG;IACH,sBAsCC;CAkCF;+BAryB8B,YAAY"}
|
|
@@ -38,11 +38,6 @@ export const Uniforms = {
|
|
|
38
38
|
SCREEN_TO_WORLD_MATRIX: 'u_screenToWorldMatrix',
|
|
39
39
|
};
|
|
40
40
|
|
|
41
|
-
/**
|
|
42
|
-
* @type {Object<string, boolean>}
|
|
43
|
-
*/
|
|
44
|
-
const empty = {};
|
|
45
|
-
|
|
46
41
|
/**
|
|
47
42
|
* Transform a zoom level into a depth value; zoom level zero has a depth value of 0.5, and increasing values
|
|
48
43
|
* have a depth trending towards 0
|
|
@@ -721,19 +716,6 @@ class WebGLBaseTileLayerRenderer extends WebGLLayerRenderer {
|
|
|
721
716
|
tileRepresentation.dispose();
|
|
722
717
|
}
|
|
723
718
|
|
|
724
|
-
// TODO: let the renderers manage their own cache instead of managing the source cache
|
|
725
|
-
/**
|
|
726
|
-
* Here we unconditionally expire the source cache since the renderer maintains
|
|
727
|
-
* its own cache.
|
|
728
|
-
* @param {import("../../Map.js").default} map Map.
|
|
729
|
-
* @param {import("../../Map.js").FrameState} frameState Frame state.
|
|
730
|
-
*/
|
|
731
|
-
const postRenderFunction = function (map, frameState) {
|
|
732
|
-
tileSource.expireCache(frameState.viewState.projection, empty);
|
|
733
|
-
};
|
|
734
|
-
|
|
735
|
-
frameState.postRenderFunctions.push(postRenderFunction);
|
|
736
|
-
|
|
737
719
|
this.postRender(gl, frameState);
|
|
738
720
|
return canvas;
|
|
739
721
|
}
|
package/source/DataTile.d.ts
CHANGED
|
@@ -189,11 +189,6 @@ declare class DataTileSource<TileType extends import("../Tile.js").default = Dat
|
|
|
189
189
|
* @type {!Object<string, import("../tilegrid/TileGrid.js").default>}
|
|
190
190
|
*/
|
|
191
191
|
private tileGridForProjection_;
|
|
192
|
-
/**
|
|
193
|
-
* @private
|
|
194
|
-
* @type {!Object<string, import("../TileCache.js").default>}
|
|
195
|
-
*/
|
|
196
|
-
private tileCacheForProjection_;
|
|
197
192
|
/**
|
|
198
193
|
* @private
|
|
199
194
|
* @type {CrossOriginAttribute}
|
package/source/DataTile.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DataTile.d.ts","sourceRoot":"","sources":["DataTile.js"],"names":[],"mappings":";
|
|
1
|
+
{"version":3,"file":"DataTile.d.ts","sourceRoot":"","sources":["DataTile.js"],"names":[],"mappings":";mCAoBa,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,EAgFjB;IAlDC;;;OAGG;IACH,gBAAgE;IAEhE;;;OAGG;IACH,kBAAmE;IAEnE;;;OAGG;IACH,mBAAsB;IAEtB;;;OAGG;IACH,yBAA0B;IAE1B;;OAEG;IACH,gBAA6B;IAoM/B;;;OAGG;IACH,yBAFW,OAAO,oBAAoB,EAAE,OAAO,QAsB9C;IArNC;;OAEG;IACH,WAFU,MAAM,CAEwD;IAExE;;;OAGG;IACH,+BAAgC;IAEhC;;;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,CA4CpB;IAoHD;;;;;;;;;;;OAWG;IACH,qCAJW,OAAO,YAAY,EAAE,cAAc,YACnC,OAAO,yBAAyB,EAAE,OAAO,QAWnD;CACF;qBAvYoB,gBAAgB;uBAIK,WAAW"}
|
package/source/DataTile.js
CHANGED
|
@@ -4,7 +4,6 @@
|
|
|
4
4
|
import DataTile from '../DataTile.js';
|
|
5
5
|
import EventType from '../events/EventType.js';
|
|
6
6
|
import ReprojDataTile from '../reproj/DataTile.js';
|
|
7
|
-
import TileCache from '../TileCache.js';
|
|
8
7
|
import TileEventType from './TileEventType.js';
|
|
9
8
|
import TileSource, {TileSourceEvent} from './Tile.js';
|
|
10
9
|
import TileState from '../TileState.js';
|
|
@@ -14,7 +13,6 @@ import {
|
|
|
14
13
|
getForProjection as getTileGridForProjection,
|
|
15
14
|
} from '../tilegrid.js';
|
|
16
15
|
import {equivalent, get as getProjection} from '../proj.js';
|
|
17
|
-
import {getKeyZXY} from '../tilecoord.js';
|
|
18
16
|
import {getUid} from '../util.js';
|
|
19
17
|
import {toPromise} from '../functions.js';
|
|
20
18
|
import {toSize} from '../size.js';
|
|
@@ -150,12 +148,6 @@ class DataTileSource extends TileSource {
|
|
|
150
148
|
*/
|
|
151
149
|
this.tileGridForProjection_ = {};
|
|
152
150
|
|
|
153
|
-
/**
|
|
154
|
-
* @private
|
|
155
|
-
* @type {!Object<string, import("../TileCache.js").default>}
|
|
156
|
-
*/
|
|
157
|
-
this.tileCacheForProjection_ = {};
|
|
158
|
-
|
|
159
151
|
/**
|
|
160
152
|
* @private
|
|
161
153
|
* @type {CrossOriginAttribute}
|
|
@@ -222,15 +214,6 @@ class DataTileSource extends TileSource {
|
|
|
222
214
|
* @return {!TileType} Tile.
|
|
223
215
|
*/
|
|
224
216
|
getReprojTile_(z, x, y, targetProj, sourceProj) {
|
|
225
|
-
const cache = this.getTileCacheForProjection(targetProj);
|
|
226
|
-
const tileCoordKey = getKeyZXY(z, x, y);
|
|
227
|
-
if (cache.containsKey(tileCoordKey)) {
|
|
228
|
-
const tile = cache.get(tileCoordKey);
|
|
229
|
-
if (tile && tile.key == this.getKey()) {
|
|
230
|
-
return tile;
|
|
231
|
-
}
|
|
232
|
-
}
|
|
233
|
-
|
|
234
217
|
const tileGrid = this.getTileGrid();
|
|
235
218
|
const reprojTilePixelRatio = Math.max.apply(
|
|
236
219
|
null,
|
|
@@ -267,11 +250,11 @@ class DataTileSource extends TileSource {
|
|
|
267
250
|
},
|
|
268
251
|
/** @type {import("../reproj/DataTile.js").Options} */ (this.tileOptions),
|
|
269
252
|
);
|
|
270
|
-
const
|
|
253
|
+
const tile = /** @type {TileType} */ (
|
|
271
254
|
/** @type {*} */ (new ReprojDataTile(options))
|
|
272
255
|
);
|
|
273
|
-
|
|
274
|
-
return
|
|
256
|
+
tile.key = this.getKey();
|
|
257
|
+
return tile;
|
|
275
258
|
}
|
|
276
259
|
|
|
277
260
|
/**
|
|
@@ -409,48 +392,6 @@ class DataTileSource extends TileSource {
|
|
|
409
392
|
}
|
|
410
393
|
}
|
|
411
394
|
}
|
|
412
|
-
|
|
413
|
-
/**
|
|
414
|
-
* @param {import("../proj/Projection.js").default} projection Projection.
|
|
415
|
-
* @return {import("../TileCache.js").default} Tile cache.
|
|
416
|
-
* @override
|
|
417
|
-
*/
|
|
418
|
-
getTileCacheForProjection(projection) {
|
|
419
|
-
const thisProj = this.getProjection();
|
|
420
|
-
if (!thisProj || equivalent(thisProj, projection)) {
|
|
421
|
-
return super.getTileCacheForProjection(projection);
|
|
422
|
-
}
|
|
423
|
-
|
|
424
|
-
const projKey = getUid(projection);
|
|
425
|
-
if (!(projKey in this.tileCacheForProjection_)) {
|
|
426
|
-
this.tileCacheForProjection_[projKey] = new TileCache(0.1); // don't cache
|
|
427
|
-
}
|
|
428
|
-
return this.tileCacheForProjection_[projKey];
|
|
429
|
-
}
|
|
430
|
-
|
|
431
|
-
/**
|
|
432
|
-
* @param {import("../proj/Projection.js").default} projection Projection.
|
|
433
|
-
* @param {!Object<string, boolean>} usedTiles Used tiles.
|
|
434
|
-
* @override
|
|
435
|
-
*/
|
|
436
|
-
expireCache(projection, usedTiles) {
|
|
437
|
-
const usedTileCache = this.getTileCacheForProjection(projection);
|
|
438
|
-
|
|
439
|
-
for (const id in this.tileCacheForProjection_) {
|
|
440
|
-
const tileCache = this.tileCacheForProjection_[id];
|
|
441
|
-
tileCache.expireCache(tileCache == usedTileCache ? usedTiles : {});
|
|
442
|
-
}
|
|
443
|
-
}
|
|
444
|
-
|
|
445
|
-
/**
|
|
446
|
-
* @override
|
|
447
|
-
*/
|
|
448
|
-
clear() {
|
|
449
|
-
super.clear();
|
|
450
|
-
for (const id in this.tileCacheForProjection_) {
|
|
451
|
-
this.tileCacheForProjection_[id].clear();
|
|
452
|
-
}
|
|
453
|
-
}
|
|
454
395
|
}
|
|
455
396
|
|
|
456
397
|
export default DataTileSource;
|
package/source/Tile.d.ts
CHANGED
|
@@ -157,17 +157,6 @@ declare class TileSource<TileType extends import("../Tile.js").default = import(
|
|
|
157
157
|
* @type {number|import("../array.js").NearestDirectionFunction}
|
|
158
158
|
*/
|
|
159
159
|
zDirection: number | import("../array.js").NearestDirectionFunction;
|
|
160
|
-
/**
|
|
161
|
-
* @return {boolean} Can expire cache.
|
|
162
|
-
*/
|
|
163
|
-
canExpireCache(): boolean;
|
|
164
|
-
/**
|
|
165
|
-
* @param {import("../proj/Projection.js").default} projection Projection.
|
|
166
|
-
* @param {!Object<string, boolean>} usedTiles Used tiles.
|
|
167
|
-
*/
|
|
168
|
-
expireCache(projection: import("../proj/Projection.js").default, usedTiles: {
|
|
169
|
-
[x: string]: boolean;
|
|
170
|
-
}): void;
|
|
171
160
|
/**
|
|
172
161
|
* @param {import("../proj/Projection.js").default} projection Projection.
|
|
173
162
|
* @return {number} Gutter.
|
|
@@ -205,12 +194,6 @@ declare class TileSource<TileType extends import("../Tile.js").default = import(
|
|
|
205
194
|
* @return {!import("../tilegrid/TileGrid.js").default} Tile grid.
|
|
206
195
|
*/
|
|
207
196
|
getTileGridForProjection(projection: import("../proj/Projection.js").default): import("../tilegrid/TileGrid.js").default;
|
|
208
|
-
/**
|
|
209
|
-
* @param {import("../proj/Projection.js").default} projection Projection.
|
|
210
|
-
* @return {import("../TileCache.js").default} Tile cache.
|
|
211
|
-
* @protected
|
|
212
|
-
*/
|
|
213
|
-
protected getTileCacheForProjection(projection: import("../proj/Projection.js").default): import("../TileCache.js").default;
|
|
214
197
|
/**
|
|
215
198
|
* Get the tile pixel ratio for this source. Subclasses may override this
|
|
216
199
|
* method, which is meant to return a supported pixel ratio that matches the
|
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":"AAuQA;;;;GAIG;AACH;IACE;;;OAGG;IACH,kBAHW,MAAM,QACN,OAAO,YAAY,EAAE,OAAO,EAWtC;IANC;;;;OAIG;IACH,MAHU,OAAO,YAAY,EAAE,OAAO,CAGtB;CAEnB;;;;;kCA7QY,MAAM,IACN,OAAO,eAAe,EAAE,WAAW,CAAC,OAAO,eAAe,EAAE,UAAU,EAAE,OAAO,oBAAoB,EAAE,OAAO,EAAE,MAAM,CAAC,GACjI,OAAW,eAAe,EAAE,WAAW,CAAC,OAAO,oBAAoB,EAAE,KAAK,EAAE,OAAO,WAAW,EAAE,WAAW,EAAE,MAAM,CAAC,GACpH,OAAW,eAAe,EAAE,WAAW,CAAC,OAAO,iBAAiB,EAAE,oBAAoB,EAAE,eAAe,EAAE,MAAM,CAAC,GAChH,OAAW,eAAe,EAAE,mBAAmB,CAAC,OAAO,eAAe,EAAE,UAAU,GAAC,OAAO,oBAAoB,EAAE,KAAK,GACrH,OAAa,iBAAiB,EAAE,oBAAoB,EAAE,MAAM,CAAC;;;;;;;;;;;;;;;;;;;;;iBAShD,OAAO,YAAY,EAAE,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;kBAzB/B,oBAAoB;AAUtC;;;;;;;GAOG;AAEH;;;;;;;;;;;;;;;GAeG;AAEH;;;;;;;;;GASG;AACH,yBAJ6C,QAAQ,SAAxC,OAAQ,YAAY,EAAE,OAAQ;IAKzC;;OAEG;IACH,qBAFW,OAAO,EA0EjB;IA9DC;;OAEG;IACH,IAFU,qBAAqB,CAAC,OAAO,WAAW,EAAE,SAAS,CAAC,CAEvD;IAEP;;OAEG;IACH,MAFU,qBAAqB,CAAC,OAAO,WAAW,EAAE,SAAS,CAAC,CAErD;IAET;;OAEG;IACH,IAFU,qBAAqB,CAAC,IAAI,CAAC,CAE9B;IAEP;;;OAGG;IACH,wBACmE;IAEnE;;;OAGG;IACH,oBAHU,OAAO,yBAAyB,EAAE,OAAO,GAAC,IAAI,CAGgB;IAOxE;;;OAGG;IACH,mBAFU,OAAO,YAAY,EAAE,IAAI,CAEd;IAErB;;;OAGG;IACH,aAAuC;IAEvC;;;OAGG;IACH,uBAFU,OAAO,YAAY,EAAE,OAAO,CAKrC;IAED;;;;;;OAMG;IACH,YAFU,MAAM,GAAC,OAAO,aAAa,EAAE,wBAAwB,CAEF;IAG/D;;;OAGG;IACH,mCAHW,OAAO,uBAAuB,EAAE,OAAO,GACtC,MAAM,CAIjB;IAED;;;OAGG;IACH,UAFY,MAAM,CAIjB;IAED;;;;OAIG;IACH,sBAHW,MAAM,QAQhB;IAiBD;;;;;;;;OAQG;IACH,WAPW,MAAM,KACN,MAAM,KACN,MAAM,cACN,MAAM,cACN,OAAO,uBAAuB,EAAE,OAAO,GACtC,QAAQ,GAAC,IAAI,CAIxB;IAED;;;;OAIG;IACH,eAHY,OAAO,yBAAyB,EAAE,OAAO,GAAC,IAAI,CAKzD;IAED;;;OAGG;IACH,qCAHW,OAAO,uBAAuB,EAAE,OAAO,GACtC,OAAQ,yBAAyB,EAAE,OAAO,CAOrD;IAED;;;;;;OAMG;IACH,8BAHW,MAAM,GACL,MAAM,CAIjB;IAED;;;;;OAKG;IACH,oBALW,MAAM,cACN,MAAM,cACN,OAAO,uBAAuB,EAAE,OAAO,GACtC,OAAO,YAAY,EAAE,IAAI,CAUpC;IAED;;;;;;;;OAQG;IACH,0CALW,OAAO,iBAAiB,EAAE,SAAS,6DAElC,OAAO,iBAAiB,EAAE,SAAS,CAU9C;IAED;;;OAGG;IACH,cAAU;CASX;mBAjQkB,aAAa"}
|
package/source/Tile.js
CHANGED
|
@@ -4,8 +4,6 @@
|
|
|
4
4
|
import Event from '../events/Event.js';
|
|
5
5
|
import Source from './Source.js';
|
|
6
6
|
import {abstract, getUid} from '../util.js';
|
|
7
|
-
import {assert} from '../asserts.js';
|
|
8
|
-
import {equivalent} from '../proj.js';
|
|
9
7
|
import {
|
|
10
8
|
getForProjection as getTileGridForProjection,
|
|
11
9
|
wrapX,
|
|
@@ -127,24 +125,6 @@ class TileSource extends Source {
|
|
|
127
125
|
this.zDirection = options.zDirection ? options.zDirection : 0;
|
|
128
126
|
}
|
|
129
127
|
|
|
130
|
-
/**
|
|
131
|
-
* @return {boolean} Can expire cache.
|
|
132
|
-
*/
|
|
133
|
-
canExpireCache() {
|
|
134
|
-
return false;
|
|
135
|
-
}
|
|
136
|
-
|
|
137
|
-
/**
|
|
138
|
-
* @param {import("../proj/Projection.js").default} projection Projection.
|
|
139
|
-
* @param {!Object<string, boolean>} usedTiles Used tiles.
|
|
140
|
-
*/
|
|
141
|
-
expireCache(projection, usedTiles) {
|
|
142
|
-
const tileCache = this.getTileCacheForProjection(projection);
|
|
143
|
-
if (tileCache) {
|
|
144
|
-
tileCache.expireCache(usedTiles);
|
|
145
|
-
}
|
|
146
|
-
}
|
|
147
|
-
|
|
148
128
|
/**
|
|
149
129
|
* @param {import("../proj/Projection.js").default} projection Projection.
|
|
150
130
|
* @return {number} Gutter.
|
|
@@ -221,20 +201,6 @@ class TileSource extends Source {
|
|
|
221
201
|
return this.tileGrid;
|
|
222
202
|
}
|
|
223
203
|
|
|
224
|
-
/**
|
|
225
|
-
* @param {import("../proj/Projection.js").default} projection Projection.
|
|
226
|
-
* @return {import("../TileCache.js").default} Tile cache.
|
|
227
|
-
* @protected
|
|
228
|
-
*/
|
|
229
|
-
getTileCacheForProjection(projection) {
|
|
230
|
-
const sourceProjection = this.getProjection();
|
|
231
|
-
assert(
|
|
232
|
-
sourceProjection === null || equivalent(sourceProjection, projection),
|
|
233
|
-
"Use the renderer's tile cache when not reprojecting.",
|
|
234
|
-
);
|
|
235
|
-
return null;
|
|
236
|
-
}
|
|
237
|
-
|
|
238
204
|
/**
|
|
239
205
|
* Get the tile pixel ratio for this source. Subclasses may override this
|
|
240
206
|
* method, which is meant to return a supported pixel ratio that matches the
|
package/source/TileImage.d.ts
CHANGED
|
@@ -163,13 +163,6 @@ declare class TileImage extends UrlTile {
|
|
|
163
163
|
* @type {typeof ImageTile}
|
|
164
164
|
*/
|
|
165
165
|
protected tileClass: typeof ImageTile;
|
|
166
|
-
/**
|
|
167
|
-
* @protected
|
|
168
|
-
* @type {!Object<string, TileCache>}
|
|
169
|
-
*/
|
|
170
|
-
protected tileCacheForProjection: {
|
|
171
|
-
[x: string]: TileCache;
|
|
172
|
-
};
|
|
173
166
|
/**
|
|
174
167
|
* @protected
|
|
175
168
|
* @type {!Object<string, import("../tilegrid/TileGrid.js").default>}
|
|
@@ -244,6 +237,5 @@ declare class TileImage extends UrlTile {
|
|
|
244
237
|
}
|
|
245
238
|
import ImageTile from '../ImageTile.js';
|
|
246
239
|
import UrlTile from './UrlTile.js';
|
|
247
|
-
import TileCache from '../TileCache.js';
|
|
248
240
|
import ReprojTile from '../reproj/Tile.js';
|
|
249
241
|
//# sourceMappingURL=TileImage.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TileImage.d.ts","sourceRoot":"","sources":["TileImage.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"TileImage.d.ts","sourceRoot":"","sources":["TileImage.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAsBc,OAAO,YAAY,EAAE,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAVjD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2CG;AAEH;;;;;GAKG;AACH;IACE;;OAEG;IACH,qBAFY,OAAO,EAwDlB;IA/BC;;;OAGG;IACH,uBAFW,MAAM,OAAA,CAG+C;IAEhE;;;OAGG;IACH,qBAFU,OAAO,SAAS,CAGuC;IAEjE;;;OAGG;IACH,iCAFU;YAAQ,MAAM,GAAE,OAAO,yBAAyB,EAAE,OAAO;KAAC,CAErC;IAE/B;;;OAGG;IACH,oCAAqE;IAErE;;;OAGG;IACH,iCAAqC;IAmBvC;;OAEG;IACH,aAFY,MAAM,CAIjB;IAiCD;;;;;;;;;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,CA2ClC;IAED;;;;;;;;OAQG;IACH,6BARW,MAAM,KACN,MAAM,KACN,MAAM,cACN,MAAM,cACN,OAAQ,uBAAuB,EAAE,OAAO,GACtC,SAAS,CAMrB;IAED;;;;OAIG;IACH,mCAHW,OAAO,QASjB;IAED;;;;;;;;;;;OAWG;IACH,qCAJW,OAAO,YAAY,EAAE,cAAc,YACnC,OAAO,yBAAyB,EAAE,OAAO,QAWnD;CACF;sBAhTqB,iBAAiB;oBAGnB,cAAc;uBAFX,mBAAmB"}
|
package/source/TileImage.js
CHANGED
|
@@ -4,11 +4,9 @@
|
|
|
4
4
|
import EventType from '../events/EventType.js';
|
|
5
5
|
import ImageTile from '../ImageTile.js';
|
|
6
6
|
import ReprojTile from '../reproj/Tile.js';
|
|
7
|
-
import TileCache from '../TileCache.js';
|
|
8
7
|
import TileState from '../TileState.js';
|
|
9
8
|
import UrlTile from './UrlTile.js';
|
|
10
9
|
import {equivalent, get as getProjection} from '../proj.js';
|
|
11
|
-
import {getKey} from '../tilecoord.js';
|
|
12
10
|
import {getForProjection as getTileGridForProjection} from '../tilegrid.js';
|
|
13
11
|
import {getUid} from '../util.js';
|
|
14
12
|
|
|
@@ -104,12 +102,6 @@ class TileImage extends UrlTile {
|
|
|
104
102
|
this.tileClass =
|
|
105
103
|
options.tileClass !== undefined ? options.tileClass : ImageTile;
|
|
106
104
|
|
|
107
|
-
/**
|
|
108
|
-
* @protected
|
|
109
|
-
* @type {!Object<string, TileCache>}
|
|
110
|
-
*/
|
|
111
|
-
this.tileCacheForProjection = {};
|
|
112
|
-
|
|
113
105
|
/**
|
|
114
106
|
* @protected
|
|
115
107
|
* @type {!Object<string, import("../tilegrid/TileGrid.js").default>}
|
|
@@ -129,34 +121,6 @@ class TileImage extends UrlTile {
|
|
|
129
121
|
this.renderReprojectionEdges_ = false;
|
|
130
122
|
}
|
|
131
123
|
|
|
132
|
-
/**
|
|
133
|
-
* @return {boolean} Can expire cache.
|
|
134
|
-
* @override
|
|
135
|
-
*/
|
|
136
|
-
canExpireCache() {
|
|
137
|
-
for (const key in this.tileCacheForProjection) {
|
|
138
|
-
if (this.tileCacheForProjection[key].canExpireCache()) {
|
|
139
|
-
return true;
|
|
140
|
-
}
|
|
141
|
-
}
|
|
142
|
-
|
|
143
|
-
return false;
|
|
144
|
-
}
|
|
145
|
-
|
|
146
|
-
/**
|
|
147
|
-
* @param {import("../proj/Projection.js").default} projection Projection.
|
|
148
|
-
* @param {!Object<string, boolean>} usedTiles Used tiles.
|
|
149
|
-
* @override
|
|
150
|
-
*/
|
|
151
|
-
expireCache(projection, usedTiles) {
|
|
152
|
-
const usedTileCache = this.getTileCacheForProjection(projection);
|
|
153
|
-
|
|
154
|
-
for (const id in this.tileCacheForProjection) {
|
|
155
|
-
const tileCache = this.tileCacheForProjection[id];
|
|
156
|
-
tileCache.expireCache(tileCache == usedTileCache ? usedTiles : {});
|
|
157
|
-
}
|
|
158
|
-
}
|
|
159
|
-
|
|
160
124
|
/**
|
|
161
125
|
* @param {import("../proj/Projection.js").default} projection Projection.
|
|
162
126
|
* @return {number} Gutter.
|
|
@@ -211,23 +175,6 @@ class TileImage extends UrlTile {
|
|
|
211
175
|
return this.tileGridForProjection[projKey];
|
|
212
176
|
}
|
|
213
177
|
|
|
214
|
-
/**
|
|
215
|
-
* @param {import("../proj/Projection.js").default} projection Projection.
|
|
216
|
-
* @return {import("../TileCache.js").default} Tile cache.
|
|
217
|
-
* @override
|
|
218
|
-
*/
|
|
219
|
-
getTileCacheForProjection(projection) {
|
|
220
|
-
const thisProj = this.getProjection();
|
|
221
|
-
if (!thisProj || equivalent(thisProj, projection)) {
|
|
222
|
-
return super.getTileCacheForProjection(projection);
|
|
223
|
-
}
|
|
224
|
-
const projKey = getUid(projection);
|
|
225
|
-
if (!(projKey in this.tileCacheForProjection)) {
|
|
226
|
-
this.tileCacheForProjection[projKey] = new TileCache(512);
|
|
227
|
-
}
|
|
228
|
-
return this.tileCacheForProjection[projKey];
|
|
229
|
-
}
|
|
230
|
-
|
|
231
178
|
/**
|
|
232
179
|
* @param {number} z Tile coordinate z.
|
|
233
180
|
* @param {number} x Tile coordinate x.
|
|
@@ -284,24 +231,15 @@ class TileImage extends UrlTile {
|
|
|
284
231
|
sourceProjection || projection,
|
|
285
232
|
);
|
|
286
233
|
}
|
|
287
|
-
const cache = this.getTileCacheForProjection(projection);
|
|
288
234
|
const tileCoord = [z, x, y];
|
|
289
|
-
let tile;
|
|
290
|
-
const tileCoordKey = getKey(tileCoord);
|
|
291
|
-
if (cache.containsKey(tileCoordKey)) {
|
|
292
|
-
tile = cache.get(tileCoordKey);
|
|
293
|
-
}
|
|
294
235
|
const key = this.getKey();
|
|
295
|
-
if (tile && tile.key == key) {
|
|
296
|
-
return tile;
|
|
297
|
-
}
|
|
298
236
|
const sourceTileGrid = this.getTileGridForProjection(sourceProjection);
|
|
299
237
|
const targetTileGrid = this.getTileGridForProjection(projection);
|
|
300
238
|
const wrappedTileCoord = this.getTileCoordForTileUrlFunction(
|
|
301
239
|
tileCoord,
|
|
302
240
|
projection,
|
|
303
241
|
);
|
|
304
|
-
const
|
|
242
|
+
const tile = new ReprojTile(
|
|
305
243
|
sourceProjection,
|
|
306
244
|
sourceTileGrid,
|
|
307
245
|
projection,
|
|
@@ -316,14 +254,8 @@ class TileImage extends UrlTile {
|
|
|
316
254
|
this.renderReprojectionEdges_,
|
|
317
255
|
this.tileOptions,
|
|
318
256
|
);
|
|
319
|
-
|
|
320
|
-
|
|
321
|
-
if (tile) {
|
|
322
|
-
cache.replace(tileCoordKey, newTile);
|
|
323
|
-
} else {
|
|
324
|
-
cache.set(tileCoordKey, newTile);
|
|
325
|
-
}
|
|
326
|
-
return newTile;
|
|
257
|
+
tile.key = key;
|
|
258
|
+
return tile;
|
|
327
259
|
}
|
|
328
260
|
|
|
329
261
|
/**
|
|
@@ -350,9 +282,6 @@ class TileImage extends UrlTile {
|
|
|
350
282
|
return;
|
|
351
283
|
}
|
|
352
284
|
this.renderReprojectionEdges_ = render;
|
|
353
|
-
for (const id in this.tileCacheForProjection) {
|
|
354
|
-
this.tileCacheForProjection[id].clear();
|
|
355
|
-
}
|
|
356
285
|
this.changed();
|
|
357
286
|
}
|
|
358
287
|
|
|
@@ -377,16 +306,6 @@ class TileImage extends UrlTile {
|
|
|
377
306
|
}
|
|
378
307
|
}
|
|
379
308
|
}
|
|
380
|
-
|
|
381
|
-
/**
|
|
382
|
-
* @override
|
|
383
|
-
*/
|
|
384
|
-
clear() {
|
|
385
|
-
super.clear();
|
|
386
|
-
for (const id in this.tileCacheForProjection) {
|
|
387
|
-
this.tileCacheForProjection[id].clear();
|
|
388
|
-
}
|
|
389
|
-
}
|
|
390
309
|
}
|
|
391
310
|
|
|
392
311
|
/**
|
package/util.js
CHANGED