ol 10.5.1-dev.1744805677005 → 10.5.1-dev.1744808247720
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/events/condition.d.ts.map +1 -1
- package/events/condition.js +5 -9
- package/layer/Layer.d.ts.map +1 -1
- package/layer/Layer.js +0 -1
- package/package.json +1 -1
- package/renderer/canvas/TileLayer.d.ts +0 -5
- package/renderer/canvas/TileLayer.d.ts.map +1 -1
- package/renderer/canvas/TileLayer.js +16 -15
- package/renderer/webgl/TileLayerBase.js +1 -1
- package/util.js +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"condition.d.ts","sourceRoot":"","sources":["condition.js"],"names":[],"mappings":"AAOA;;;;;GAKG;AAEH;;;;GAIG;AACH,2CAFY,SAAS,CAkBpB;AAUM,4CAJI,OAAO,uBAAuB,EAAE,OAAO,GACtC,OAAO,CAUlB;AAUM,kDAJI,OAAO,uBAAuB,EAAE,OAAO,GACtC,OAAO,CAUlB;AAUM,6BAJI,OAAO,uBAAuB,EAAE,OAAO,GACtC,OAAO,CAWlB;AAQM,yCAHI,OAAO,uBAAuB,EAAE,OAAO,GACtC,OAAO,CASlB;AAED;;;;;;GAMG;AACH,iCAA2B;AASpB,uCAJI,OAAO,uBAAuB,EAAE,OAAO,GACtC,OAAO,CAKlB;AAWM,mDAHI,OAAO,uBAAuB,EAAE,OAAO,GACtC,OAAO,CASlB;AAED;;;;;;GAMG;AACH,iCAA2B;AAUpB,6CAJI,OAAO,uBAAuB,EAAE,OAAO,GACtC,OAAO,CAKlB;AASM,6CAJI,OAAO,uBAAuB,EAAE,OAAO,GACtC,OAAO,CAKlB;AASM,6CAJI,OAAO,uBAAuB,EAAE,OAAO,GACtC,OAAO,CAKlB;AAUM,gDAJI,OAAO,uBAAuB,EAAE,OAAO,GACtC,OAAO,CAYlB;AAWM,yDAJI,OAAO,uBAAuB,EAAE,OAAO,GACtC,OAAO,CAUlB;AAUM,qDAJI,OAAO,uBAAuB,EAAE,OAAO,GACtC,OAAO,CAMlB;AAUM,8CAJI,OAAO,uBAAuB,EAAE,OAAO,GACtC,OAAO,CAUlB;AAWM,mDAJI,OAAO,uBAAuB,EAAE,OAAO,GACtC,OAAO,CAelB;AASM,2CAJI,OAAO,uBAAuB,EAAE,OAAO,GACtC,OAAO,
|
|
1
|
+
{"version":3,"file":"condition.d.ts","sourceRoot":"","sources":["condition.js"],"names":[],"mappings":"AAOA;;;;;GAKG;AAEH;;;;GAIG;AACH,2CAFY,SAAS,CAkBpB;AAUM,4CAJI,OAAO,uBAAuB,EAAE,OAAO,GACtC,OAAO,CAUlB;AAUM,kDAJI,OAAO,uBAAuB,EAAE,OAAO,GACtC,OAAO,CAUlB;AAUM,6BAJI,OAAO,uBAAuB,EAAE,OAAO,GACtC,OAAO,CAWlB;AAQM,yCAHI,OAAO,uBAAuB,EAAE,OAAO,GACtC,OAAO,CASlB;AAED;;;;;;GAMG;AACH,iCAA2B;AASpB,uCAJI,OAAO,uBAAuB,EAAE,OAAO,GACtC,OAAO,CAKlB;AAWM,mDAHI,OAAO,uBAAuB,EAAE,OAAO,GACtC,OAAO,CASlB;AAED;;;;;;GAMG;AACH,iCAA2B;AAUpB,6CAJI,OAAO,uBAAuB,EAAE,OAAO,GACtC,OAAO,CAKlB;AASM,6CAJI,OAAO,uBAAuB,EAAE,OAAO,GACtC,OAAO,CAKlB;AASM,6CAJI,OAAO,uBAAuB,EAAE,OAAO,GACtC,OAAO,CAKlB;AAUM,gDAJI,OAAO,uBAAuB,EAAE,OAAO,GACtC,OAAO,CAYlB;AAWM,yDAJI,OAAO,uBAAuB,EAAE,OAAO,GACtC,OAAO,CAUlB;AAUM,qDAJI,OAAO,uBAAuB,EAAE,OAAO,GACtC,OAAO,CAMlB;AAUM,8CAJI,OAAO,uBAAuB,EAAE,OAAO,GACtC,OAAO,CAUlB;AAWM,mDAJI,OAAO,uBAAuB,EAAE,OAAO,GACtC,OAAO,CAelB;AASM,2CAJI,OAAO,uBAAuB,EAAE,OAAO,GACtC,OAAO,CAOlB;AASM,2CAJI,OAAO,uBAAuB,EAAE,OAAO,GACtC,OAAO,CAOlB;AASM,yCAJI,OAAO,uBAAuB,EAAE,OAAO,GACtC,OAAO,CAOlB;AAWM,+CAJI,OAAO,uBAAuB,EAAE,OAAO,GACtC,OAAO,CAUlB;;;;;wBA/TY,CAAS,IAAO,EAAD,OAAC,EAAE,IAAuC,EAAvC,OAAO,uBAAuB,EAAE,OAAO,KAAG,OAAO;qBAPtD,iBAAiB;sBAAjB,iBAAiB"}
|
package/events/condition.js
CHANGED
|
@@ -134,7 +134,7 @@ export const click = function (mapBrowserEvent) {
|
|
|
134
134
|
export const mouseActionButton = function (mapBrowserEvent) {
|
|
135
135
|
const originalEvent = mapBrowserEvent.originalEvent;
|
|
136
136
|
return (
|
|
137
|
-
|
|
137
|
+
'pointerId' in originalEvent &&
|
|
138
138
|
originalEvent.button == 0 &&
|
|
139
139
|
!(WEBKIT && MAC && originalEvent.ctrlKey)
|
|
140
140
|
);
|
|
@@ -283,9 +283,7 @@ export const targetNotEditable = function (mapBrowserEvent) {
|
|
|
283
283
|
export const mouseOnly = function (mapBrowserEvent) {
|
|
284
284
|
const pointerEvent = mapBrowserEvent.originalEvent;
|
|
285
285
|
// see https://www.w3.org/TR/pointerevents/#widl-PointerEvent-pointerType
|
|
286
|
-
return
|
|
287
|
-
pointerEvent instanceof PointerEvent && pointerEvent.pointerType == 'mouse'
|
|
288
|
-
);
|
|
286
|
+
return 'pointerId' in pointerEvent && pointerEvent.pointerType == 'mouse';
|
|
289
287
|
};
|
|
290
288
|
|
|
291
289
|
/**
|
|
@@ -298,9 +296,7 @@ export const mouseOnly = function (mapBrowserEvent) {
|
|
|
298
296
|
export const touchOnly = function (mapBrowserEvent) {
|
|
299
297
|
const pointerEvt = mapBrowserEvent.originalEvent;
|
|
300
298
|
// see https://www.w3.org/TR/pointerevents/#widl-PointerEvent-pointerType
|
|
301
|
-
return
|
|
302
|
-
pointerEvt instanceof PointerEvent && pointerEvt.pointerType === 'touch'
|
|
303
|
-
);
|
|
299
|
+
return 'pointerId' in pointerEvt && pointerEvt.pointerType === 'touch';
|
|
304
300
|
};
|
|
305
301
|
|
|
306
302
|
/**
|
|
@@ -313,7 +309,7 @@ export const touchOnly = function (mapBrowserEvent) {
|
|
|
313
309
|
export const penOnly = function (mapBrowserEvent) {
|
|
314
310
|
const pointerEvt = mapBrowserEvent.originalEvent;
|
|
315
311
|
// see https://www.w3.org/TR/pointerevents/#widl-PointerEvent-pointerType
|
|
316
|
-
return
|
|
312
|
+
return 'pointerId' in pointerEvt && pointerEvt.pointerType === 'pen';
|
|
317
313
|
};
|
|
318
314
|
|
|
319
315
|
/**
|
|
@@ -328,7 +324,7 @@ export const penOnly = function (mapBrowserEvent) {
|
|
|
328
324
|
export const primaryAction = function (mapBrowserEvent) {
|
|
329
325
|
const pointerEvent = mapBrowserEvent.originalEvent;
|
|
330
326
|
return (
|
|
331
|
-
|
|
327
|
+
'pointerId' in pointerEvent &&
|
|
332
328
|
pointerEvent.isPrimary &&
|
|
333
329
|
pointerEvent.button === 0
|
|
334
330
|
);
|
package/layer/Layer.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Layer.d.ts","sourceRoot":"","sources":["Layer.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Layer.d.ts","sourceRoot":"","sources":["Layer.js"],"names":[],"mappings":"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"}
|
package/layer/Layer.js
CHANGED
package/package.json
CHANGED
|
@@ -50,11 +50,6 @@ declare class CanvasTileLayerRenderer<LayerType extends import("../../layer/Tile
|
|
|
50
50
|
* @type {import("../../proj/Projection.js").default|null}
|
|
51
51
|
*/
|
|
52
52
|
protected renderedProjection: import("../../proj/Projection.js").default | null;
|
|
53
|
-
/**
|
|
54
|
-
* @private
|
|
55
|
-
* @type {number}
|
|
56
|
-
*/
|
|
57
|
-
private renderedRevision_;
|
|
58
53
|
/**
|
|
59
54
|
* @protected
|
|
60
55
|
* @type {!Array<import("../../Tile.js").default>}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TileLayer.d.ts","sourceRoot":"","sources":["TileLayer.js"],"names":[],"mappings":";;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"TileLayer.d.ts","sourceRoot":"","sources":["TileLayer.js"],"names":[],"mappings":";;;;;;;;;;AA2GA;;;GAGG;AAEH;;;;;;GAMG;AACH,sCAHkG,SAAS,SAA7F,OAAO,qBAAqB,EAAE,OAAO,GAAC,OAAO,2BAA2B,EAAE,OAAQ;IAI9F;;;OAGG;IACH,uBAHW,SAAS,YACT,OAAO,EAkFjB;IA3EC;;;OAGG;IACH,eAFU,OAAO,CAEQ;IAEzB;;;OAGG;IACH,gBAFU,OAAO,CAEU;IAE3B;;;OAGG;IACH,wBAA2B;IAE3B;;;OAGG;IACH,8BAFU,MAAM,CAEO;IAEvB;;;OAGG;IACH,8BAFU,OAAO,0BAA0B,EAAE,OAAO,GAAC,IAAI,CAE3B;IAE9B;;;OAGG;IACH,yBAFW,KAAK,CAAC,OAAO,eAAe,EAAE,OAAO,CAAC,CAE1B;IAEvB;;;OAGG;IACH,2BAAuB;IAEvB;;;OAGG;IACH,gCAA4B;IAE5B;;;OAGG;IACH,sBAFU,OAAO,iBAAiB,EAAE,MAAM,CAEX;IAE/B;;;OAGG;IACH,uBAA+C;IAE/C;;;OAGG;IACH,uBAA8C;IAI9C;;;OAGG;IACH,mBAAyC;IAK3C;;OAEG;IACH,8BAEC;IAED;;;;;;;;;OASG;IACH,6BAPW,MAAM,KACN,MAAM,KACN,MAAM,cACN,OAAO,cAAc,EAAE,UAAU,GAChC,OAAO,eAAe,EAAE,OAAO,GAAC,IAAI,CA4B/C;IAED;;;;;;;OAOG;IACH,qBAPW,MAAM,KACN,MAAM,KACN,MAAM,cACN,OAAO,cAAc,EAAE,UAAU,GAChC,OAAO,eAAe,EAAE,OAAO,GAAC,IAAI,CAS/C;IAED;;;;OAIG;IACH,wBAJW,OAAO,gBAAgB,EAAE,KAAK,GAC7B,iBAAiB,CA6E5B;IAgCD;;;;;;OAMG;IACH,yBANW,OAAO,cAAc,EAAE,UAAU,UACjC,OAAO,iBAAiB,EAAE,MAAM,YAChC,MAAM,YACN,UAAU,WACV,MAAM,QAmFhB;IAED;;;;;;;OAOG;IACH,uBAwBC;IAED;;;;;;;;;OASG;IACH,sBAgCC;IAED;;;;;;;;;;;;;OAaG;IACH,iCALW,OAAO,cAAc,EAAE,UAAU,UACjC,WAAW,GACV,WAAW,CA6TtB;IAED;;;OAGG;IACH,2BAFW,MAAM,QAOhB;IAED;;;;;;;;;;OAUG;IACH,yBAVW,OAAO,eAAe,EAAE,OAAO,cAC/B,OAAO,cAAc,EAAE,UAAU,KACjC,MAAM,KACN,MAAM,KACN,MAAM,KACN,MAAM,UACN,MAAM,cACN,OAAO,QAiDjB;IAED;;OAEG;IACH,YAFY,iBAAiB,CAK5B;IAED;;;;;OAKG;IACH,6BAJW,OAAO,oBAAoB,EAAE,OAAO,GACnC,iBAAiB,GAAC,gBAAgB,GAAC,gBAAgB,CAK9D;IAED;;;;;OAKG;IACH,qCALW;YAAQ,MAAM,GAAE;gBAAQ,MAAM,GAAE,OAAO;SAAC;KAAC,cACzC,OAAO,sBAAsB,EAAE,OAAO,QACtC,OAAO,eAAe,EAAE,OAAO,QAUzC;CACF;gCAt7B+B,YAAY;qBAPvB,2BAA2B"}
|
|
@@ -28,14 +28,15 @@ import {getUid} from '../../util.js';
|
|
|
28
28
|
import CanvasLayerRenderer from './Layer.js';
|
|
29
29
|
|
|
30
30
|
/**
|
|
31
|
+
* @param {import("../../source/Tile.js").default} source The tile source.
|
|
31
32
|
* @param {string} sourceKey The source key.
|
|
32
33
|
* @param {number} z The tile z level.
|
|
33
34
|
* @param {number} x The tile x level.
|
|
34
35
|
* @param {number} y The tile y level.
|
|
35
36
|
* @return {string} The cache key.
|
|
36
37
|
*/
|
|
37
|
-
function getCacheKey(sourceKey, z, x, y) {
|
|
38
|
-
return `${sourceKey},${getKeyZXY(z, x, y)}`;
|
|
38
|
+
function getCacheKey(source, sourceKey, z, x, y) {
|
|
39
|
+
return `${getUid(source)},${sourceKey},${getKeyZXY(z, x, y)}`;
|
|
39
40
|
}
|
|
40
41
|
|
|
41
42
|
/**
|
|
@@ -156,12 +157,6 @@ class CanvasTileLayerRenderer extends CanvasLayerRenderer {
|
|
|
156
157
|
*/
|
|
157
158
|
this.renderedProjection = null;
|
|
158
159
|
|
|
159
|
-
/**
|
|
160
|
-
* @private
|
|
161
|
-
* @type {number}
|
|
162
|
-
*/
|
|
163
|
-
this.renderedRevision_;
|
|
164
|
-
|
|
165
160
|
/**
|
|
166
161
|
* @protected
|
|
167
162
|
* @type {!Array<import("../../Tile.js").default>}
|
|
@@ -230,7 +225,7 @@ class CanvasTileLayerRenderer extends CanvasLayerRenderer {
|
|
|
230
225
|
const tileCache = this.tileCache_;
|
|
231
226
|
const tileLayer = this.getLayer();
|
|
232
227
|
const tileSource = tileLayer.getSource();
|
|
233
|
-
const cacheKey = getCacheKey(tileSource.getKey(), z, x, y);
|
|
228
|
+
const cacheKey = getCacheKey(tileSource, tileSource.getKey(), z, x, y);
|
|
234
229
|
|
|
235
230
|
/** @type {import("../../Tile.js").default} */
|
|
236
231
|
let tile;
|
|
@@ -369,10 +364,10 @@ class CanvasTileLayerRenderer extends CanvasLayerRenderer {
|
|
|
369
364
|
return false;
|
|
370
365
|
}
|
|
371
366
|
const sourceRevision = source.getRevision();
|
|
372
|
-
if (!this.
|
|
373
|
-
this.
|
|
374
|
-
} else if (this.
|
|
375
|
-
this.
|
|
367
|
+
if (!this.renderedSourceRevision_) {
|
|
368
|
+
this.renderedSourceRevision_ = sourceRevision;
|
|
369
|
+
} else if (this.renderedSourceRevision_ !== sourceRevision) {
|
|
370
|
+
this.renderedSourceRevision_ = sourceRevision;
|
|
376
371
|
if (this.renderedSourceKey_ === source.getKey()) {
|
|
377
372
|
this.tileCache_.clear();
|
|
378
373
|
}
|
|
@@ -485,7 +480,13 @@ class CanvasTileLayerRenderer extends CanvasLayerRenderer {
|
|
|
485
480
|
const y = tileCoord[2];
|
|
486
481
|
const staleKeys = this.getStaleKeys();
|
|
487
482
|
for (let i = 0; i < staleKeys.length; ++i) {
|
|
488
|
-
const cacheKey = getCacheKey(
|
|
483
|
+
const cacheKey = getCacheKey(
|
|
484
|
+
this.getLayer().getSource(),
|
|
485
|
+
staleKeys[i],
|
|
486
|
+
z,
|
|
487
|
+
x,
|
|
488
|
+
y,
|
|
489
|
+
);
|
|
489
490
|
if (tileCache.containsKey(cacheKey)) {
|
|
490
491
|
const tile = tileCache.peek(cacheKey);
|
|
491
492
|
if (tile.getState() === TileState.LOADED) {
|
|
@@ -525,7 +526,7 @@ class CanvasTileLayerRenderer extends CanvasLayerRenderer {
|
|
|
525
526
|
const sourceKey = source.getKey();
|
|
526
527
|
for (let x = tileRange.minX; x <= tileRange.maxX; ++x) {
|
|
527
528
|
for (let y = tileRange.minY; y <= tileRange.maxY; ++y) {
|
|
528
|
-
const cacheKey = getCacheKey(sourceKey, altZ, x, y);
|
|
529
|
+
const cacheKey = getCacheKey(source, sourceKey, altZ, x, y);
|
|
529
530
|
let loaded = false;
|
|
530
531
|
if (tileCache.containsKey(cacheKey)) {
|
|
531
532
|
const tile = tileCache.peek(cacheKey);
|
|
@@ -124,7 +124,7 @@ function getRenderExtent(frameState, extent) {
|
|
|
124
124
|
* @return {string} The cache key.
|
|
125
125
|
*/
|
|
126
126
|
export function getCacheKey(source, tileCoord) {
|
|
127
|
-
return `${source.getKey()},${source.getRevision()},${getTileCoordKey(tileCoord)}`;
|
|
127
|
+
return `${getUid(source)},${source.getKey()},${source.getRevision()},${getTileCoordKey(tileCoord)}`;
|
|
128
128
|
}
|
|
129
129
|
|
|
130
130
|
/**
|
package/util.js
CHANGED