ol 9.1.1-dev.1711646295969 → 9.1.1-dev.1711656042287
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 +2 -2
- package/dist/ol.js.map +1 -1
- package/package.json +1 -1
- package/renderer/Composite.d.ts.map +1 -1
- package/renderer/Composite.js +3 -0
- package/renderer/canvas/VectorLayer.d.ts.map +1 -1
- package/renderer/canvas/VectorLayer.js +10 -6
- package/util.js +1 -1
package/package.json
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Composite.d.ts","sourceRoot":"","sources":["Composite.js"],"names":[],"mappings":";AAcA;;;;GAIG;AACH;IAOI;;OAEG;IACH,wBAFU,OAAO,cAAc,EAAE,SAAS,CAMzC;IAED;;;OAGG;IACH,iBAA6C;IAY7C;;;OAGG;IACH,kBAAmB;IAEnB;;;OAGG;IACH,yBAA4B;IA+F9B;;;OAGG;IACH,sBAHW,OAAO,WAAW,EAAE,UAAU,eAC9B,MAAM,OAAO,mBAAmB,EAAE,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"Composite.d.ts","sourceRoot":"","sources":["Composite.js"],"names":[],"mappings":";AAcA;;;;GAIG;AACH;IAOI;;OAEG;IACH,wBAFU,OAAO,cAAc,EAAE,SAAS,CAMzC;IAED;;;OAGG;IACH,iBAA6C;IAY7C;;;OAGG;IACH,kBAAmB;IAEnB;;;OAGG;IACH,yBAA4B;IA+F9B;;;OAGG;IACH,sBAHW,OAAO,WAAW,EAAE,UAAU,eAC9B,MAAM,OAAO,mBAAmB,EAAE,KAAK,CAAC,QAgBlD;CACF;wBA3KuB,UAAU"}
|
package/renderer/Composite.js
CHANGED
|
@@ -159,6 +159,9 @@ class CompositeMapRenderer extends MapRenderer {
|
|
|
159
159
|
* @param {Array<import('../layer/Layer.js').State>} layerStates Layers.
|
|
160
160
|
*/
|
|
161
161
|
declutter(frameState, layerStates) {
|
|
162
|
+
if (!frameState.declutter) {
|
|
163
|
+
return;
|
|
164
|
+
}
|
|
162
165
|
for (let i = layerStates.length - 1; i >= 0; --i) {
|
|
163
166
|
const layerState = layerStates[i];
|
|
164
167
|
const layer = layerState.layer;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"VectorLayer.d.ts","sourceRoot":"","sources":["VectorLayer.js"],"names":[],"mappings":";AAkDA;;;;GAIG;AACH;IACE;;OAEG;IACH,gFAwGC;IArGC,eAAe;IACf,qCAA2E;IAE3E;;OAEG;IACH,yBAFU,OAAO,CAEW;IAE5B;;OAEG;IACH,wBAFU,SAAS,GAAC,IAAI,CAEU;IAElC;;OAEG;IACH,mBAFU,MAAM,OAAO,kBAAkB,EAAE,OAAO,CAAC,CAEtB;IAE7B;;;OAGG;IACH,0BAA2B;IAE3B;;;OAGG;IACH,4BAA8B;IAE9B;;;OAGG;IACH,wBAAoC;IAEpC;;;OAGG;IACH,+BAA2C;IAE3C;;;OAGG;IACH,0BAAsB;IAEtB;;;OAGG;IACH,wBAA2B;IAE3B;;;OAGG;IACH,4BAA+B;IAE/B;;;OAGG;IACH,4BAA4B;IAE5B;;;OAGG;IACH,6BAAgC;IAEhC;;;OAGG;IACH,qBAAwB;IAExB;;;OAGG;IACH,oBAFU,OAAO,CAEa;IAE9B;;;OAGG;IACH,UAFU,OAAO,CAEG;IAEpB;;;OAGG;IACH,uBAA0B;IAE1B;;;OAGG;IACH,iBAAiB;IAGnB;;;;;OAKG;IACH,4BALW,aAAa,cACb,OAAO,cAAc,EAAE,UAAU,6CAyD3C;IAED;;OAEG;IACH,wBASC;IAED;;OAEG;IACH,0BAWC;IAED;;;OAGG;IACH,4BAFW,OAAO,cAAc,EAAE,UAAU,QAO3C;IAiHD;;;;;OAKG;IACH,mBAJW,OAAO,gBAAgB,EAAE,KAAK,GAC7B,QAAQ,MAAM,OAAO,eAAe,EAAE,OAAO,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"VectorLayer.d.ts","sourceRoot":"","sources":["VectorLayer.js"],"names":[],"mappings":";AAkDA;;;;GAIG;AACH;IACE;;OAEG;IACH,gFAwGC;IArGC,eAAe;IACf,qCAA2E;IAE3E;;OAEG;IACH,yBAFU,OAAO,CAEW;IAE5B;;OAEG;IACH,wBAFU,SAAS,GAAC,IAAI,CAEU;IAElC;;OAEG;IACH,mBAFU,MAAM,OAAO,kBAAkB,EAAE,OAAO,CAAC,CAEtB;IAE7B;;;OAGG;IACH,0BAA2B;IAE3B;;;OAGG;IACH,4BAA8B;IAE9B;;;OAGG;IACH,wBAAoC;IAEpC;;;OAGG;IACH,+BAA2C;IAE3C;;;OAGG;IACH,0BAAsB;IAEtB;;;OAGG;IACH,wBAA2B;IAE3B;;;OAGG;IACH,4BAA+B;IAE/B;;;OAGG;IACH,4BAA4B;IAE5B;;;OAGG;IACH,6BAAgC;IAEhC;;;OAGG;IACH,qBAAwB;IAExB;;;OAGG;IACH,oBAFU,OAAO,CAEa;IAE9B;;;OAGG;IACH,UAFU,OAAO,CAEG;IAEpB;;;OAGG;IACH,uBAA0B;IAE1B;;;OAGG;IACH,iBAAiB;IAGnB;;;;;OAKG;IACH,4BALW,aAAa,cACb,OAAO,cAAc,EAAE,UAAU,6CAyD3C;IAED;;OAEG;IACH,wBASC;IAED;;OAEG;IACH,0BAWC;IAED;;;OAGG;IACH,4BAFW,OAAO,cAAc,EAAE,UAAU,QAO3C;IAiHD;;;;;OAKG;IACH,mBAJW,OAAO,gBAAgB,EAAE,KAAK,GAC7B,QAAQ,MAAM,OAAO,eAAe,EAAE,OAAO,CAAC,CAAC,CA+F1D;IA4FD;;;;OAIG;IACH,gCAEC;IAwMD;;;;;;;;;OASG;IACH,uBATW,OAAO,kBAAkB,EAAE,OAAO,oBAClC,MAAM,UACN,OAAO,sBAAsB,EAAE,OAAO,GAAC,MAAM,OAAO,sBAAsB,EAAE,OAAO,CAAC,gBACpF,OAAO,qCAAqC,EAAE,OAAO,mIAIpD,OAAO,CA0ClB;CACF;gCAtzB6C,YAAY;0BAKnD,sCAAsC"}
|
|
@@ -200,7 +200,7 @@ class CanvasVectorLayerRenderer extends CanvasLayerRenderer {
|
|
|
200
200
|
const transform = this.getRenderTransform(
|
|
201
201
|
center,
|
|
202
202
|
resolution,
|
|
203
|
-
|
|
203
|
+
0,
|
|
204
204
|
pixelRatio,
|
|
205
205
|
width,
|
|
206
206
|
height,
|
|
@@ -288,7 +288,8 @@ class CanvasVectorLayerRenderer extends CanvasLayerRenderer {
|
|
|
288
288
|
const layerState = frameState.layerStatesArray[frameState.layerIndex];
|
|
289
289
|
this.opacity_ = layerState.opacity;
|
|
290
290
|
const extent = frameState.extent;
|
|
291
|
-
const
|
|
291
|
+
const viewState = frameState.viewState;
|
|
292
|
+
const resolution = viewState.resolution;
|
|
292
293
|
const width = Math.round((getWidth(extent) / resolution) * pixelRatio);
|
|
293
294
|
const height = Math.round((getHeight(extent) / resolution) * pixelRatio);
|
|
294
295
|
|
|
@@ -299,7 +300,7 @@ class CanvasVectorLayerRenderer extends CanvasLayerRenderer {
|
|
|
299
300
|
frameState.size[1] / 2,
|
|
300
301
|
1 / pixelRatio,
|
|
301
302
|
1 / pixelRatio,
|
|
302
|
-
|
|
303
|
+
viewState.rotation,
|
|
303
304
|
-width / 2,
|
|
304
305
|
-height / 2,
|
|
305
306
|
);
|
|
@@ -338,7 +339,6 @@ class CanvasVectorLayerRenderer extends CanvasLayerRenderer {
|
|
|
338
339
|
|
|
339
340
|
this.preRender(context, frameState);
|
|
340
341
|
|
|
341
|
-
const viewState = frameState.viewState;
|
|
342
342
|
const projection = viewState.projection;
|
|
343
343
|
|
|
344
344
|
// clipped rendering if layer extent is set
|
|
@@ -384,8 +384,12 @@ class CanvasVectorLayerRenderer extends CanvasLayerRenderer {
|
|
|
384
384
|
*/
|
|
385
385
|
getFeatures(pixel) {
|
|
386
386
|
return new Promise((resolve) => {
|
|
387
|
-
if (
|
|
388
|
-
|
|
387
|
+
if (
|
|
388
|
+
this.frameState &&
|
|
389
|
+
!this.hitDetectionImageData_ &&
|
|
390
|
+
!this.animatingOrInteracting_
|
|
391
|
+
) {
|
|
392
|
+
const size = this.frameState.size.slice();
|
|
389
393
|
apply(this.pixelTransform, size);
|
|
390
394
|
const center = this.renderedCenter_;
|
|
391
395
|
const resolution = this.renderedResolution_;
|
package/util.js
CHANGED