@vcmap/core 6.1.3 → 6.1.4
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/src/util/layerCollection.d.ts +1 -0
- package/dist/src/util/layerCollection.js +7 -0
- package/dist/src/util/layerCollection.js.map +1 -1
- package/dist/src/vectorCluster/vectorClusterStyleItem.d.ts +1 -1
- package/dist/src/vectorCluster/vectorClusterStyleItem.js +2 -2
- package/dist/src/vectorCluster/vectorClusterStyleItem.js.map +1 -1
- package/package.json +1 -1
- package/src/util/layerCollection.ts +12 -0
- package/src/vectorCluster/vectorClusterStyleItem.ts +6 -3
|
@@ -96,6 +96,7 @@ declare class LayerCollection extends IndexedCollection<Layer> {
|
|
|
96
96
|
*/
|
|
97
97
|
add(layer: Layer, index?: number): number | null;
|
|
98
98
|
protected _remove(layer: Layer): number;
|
|
99
|
+
protected _move(layer: Layer, itemIndex: number, targetIndex: number): number;
|
|
99
100
|
clear(): void;
|
|
100
101
|
destroy(): void;
|
|
101
102
|
}
|
|
@@ -268,6 +268,13 @@ class LayerCollection extends IndexedCollection {
|
|
|
268
268
|
}
|
|
269
269
|
return super._remove(layer);
|
|
270
270
|
}
|
|
271
|
+
_move(layer, itemIndex, targetIndex) {
|
|
272
|
+
const target = super._move(layer, itemIndex, targetIndex);
|
|
273
|
+
if (itemIndex !== target) {
|
|
274
|
+
this._ensureLocalZIndex(layer);
|
|
275
|
+
}
|
|
276
|
+
return target;
|
|
277
|
+
}
|
|
271
278
|
clear() {
|
|
272
279
|
Object.values(this._layerEventListeners)
|
|
273
280
|
.flat()
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"layerCollection.js","sourceRoot":"","sources":["../../../src/util/layerCollection.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"layerCollection.js","sourceRoot":"","sources":["../../../src/util/layerCollection.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,7 +17,7 @@ export type VectorClusterTemplateFunction = (styleItem: VectorClusterStyleItem,
|
|
|
17
17
|
};
|
|
18
18
|
export default class VectorClusterStyleItem extends VcsObject {
|
|
19
19
|
static get className(): string;
|
|
20
|
-
static getDefaultOptions(): Required<VectorClusterStyleItemOptions>;
|
|
20
|
+
static getDefaultOptions(): Required<Omit<VectorClusterStyleItemOptions, 'templateContext'>> & Pick<VectorClusterStyleItemOptions, 'templateContext'>;
|
|
21
21
|
private _template;
|
|
22
22
|
private _templateFunction;
|
|
23
23
|
private _breaks;
|
|
@@ -48,7 +48,7 @@ export default class VectorClusterStyleItem extends VcsObject {
|
|
|
48
48
|
' </text>',
|
|
49
49
|
'</svg>',
|
|
50
50
|
].join(''),
|
|
51
|
-
templateContext:
|
|
51
|
+
templateContext: undefined,
|
|
52
52
|
breaks: [2, 3, 4, 5, 10, 15, 20, 25],
|
|
53
53
|
zeroScaleOffset: 3,
|
|
54
54
|
scaleFactor: 0.08,
|
|
@@ -254,7 +254,7 @@ export default class VectorClusterStyleItem extends VcsObject {
|
|
|
254
254
|
const { breaks } = this;
|
|
255
255
|
if (breaks.length !== defaultOptions.breaks.length ||
|
|
256
256
|
breaks.some((b) => !defaultOptions.breaks.includes(b))) {
|
|
257
|
-
config.breaks = breaks;
|
|
257
|
+
config.breaks = [...breaks];
|
|
258
258
|
}
|
|
259
259
|
if (this.zeroScaleOffset !== defaultOptions.zeroScaleOffset) {
|
|
260
260
|
config.zeroScaleOffset = this.zeroScaleOffset;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vectorClusterStyleItem.js","sourceRoot":"","sources":["../../../src/vectorCluster/vectorClusterStyleItem.ts"],"names":[],"mappings":"AAAA,OAAO,KAAwB,MAAM,mBAAmB,CAAC;AACzD,OAAO,IAAI,MAAM,kBAAkB,CAAC;AAEpC,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC7D,OAAO,SAAS,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAClE,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAC5D,OAAO,SAA+B,MAAM,iBAAiB,CAAC;AAC9D,OAAO,QAAQ,MAAM,gBAAgB,CAAC;AAEtC,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AACnE,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAgBxD,SAAS,6BAA6B,CACpC,QAAgB;IAEhB,OAAO,CAAC,SAAS,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC;QAC/B,QAAQ;QACR,QAAQ,EAAE,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;KAC5D,CAAC,CAAC;AACL,CAAC;AAED,MAAM,CAAC,OAAO,OAAO,sBAAuB,SAAQ,SAAS;IAC3D,MAAM,KAAK,SAAS;QAClB,OAAO,wBAAwB,CAAC;IAClC,CAAC;IAED,MAAM,CAAC,iBAAiB;
|
|
1
|
+
{"version":3,"file":"vectorClusterStyleItem.js","sourceRoot":"","sources":["../../../src/vectorCluster/vectorClusterStyleItem.ts"],"names":[],"mappings":"AAAA,OAAO,KAAwB,MAAM,mBAAmB,CAAC;AACzD,OAAO,IAAI,MAAM,kBAAkB,CAAC;AAEpC,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC7D,OAAO,SAAS,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAClE,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAC5D,OAAO,SAA+B,MAAM,iBAAiB,CAAC;AAC9D,OAAO,QAAQ,MAAM,gBAAgB,CAAC;AAEtC,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AACnE,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAgBxD,SAAS,6BAA6B,CACpC,QAAgB;IAEhB,OAAO,CAAC,SAAS,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC;QAC/B,QAAQ;QACR,QAAQ,EAAE,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;KAC5D,CAAC,CAAC;AACL,CAAC;AAED,MAAM,CAAC,OAAO,OAAO,sBAAuB,SAAQ,SAAS;IAC3D,MAAM,KAAK,SAAS;QAClB,OAAO,wBAAwB,CAAC;IAClC,CAAC;IAED,MAAM,CAAC,iBAAiB;QAItB,OAAO;YACL,IAAI,EAAE,wBAAwB;YAC9B,IAAI,EAAE,EAAE;YACR,UAAU,EAAE,EAAE;YACd,QAAQ,EAAE;gBACR,qFAAqF;gBACrF,gBAAgB;gBAChB,YAAY;gBACZ,mBAAmB;gBACnB,qBAAqB;gBACrB,2BAA2B;gBAC3B,uBAAuB;gBACvB,IAAI;gBACJ,UAAU;gBACV,uDAAuD;gBACvD,mBAAmB;gBACnB,yBAAyB;gBACzB,gCAAgC;gBAChC,+BAA+B;gBAC/B,IAAI;gBACJ,kBAAkB;gBAClB,4DAA4D;gBAC5D,oCAAoC;gBACpC,eAAe;gBACf,UAAU;gBACV,QAAQ;aACT,CAAC,IAAI,CAAC,EAAE,CAAC;YACV,eAAe,EAAE,SAAS;YAC1B,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC;YACpC,eAAe,EAAE,CAAC;YAClB,WAAW,EAAE,IAAI;SAClB,CAAC;IACJ,CAAC;IAEO,SAAS,GAA2C,EAAE,CAAC;IAEvD,iBAAiB,GACvB,6BAA6B,CAAC,EAAE,CAAC,CAAC;IAE5B,OAAO,GAAa,EAAE,CAAC;IAEvB,gBAAgB,CAAS;IAEzB,gBAAgB,CAA2B;IAE3C,YAAY,CAAS;IAErB,WAAW,GAAG,IAAI,GAAG,EAAiB,CAAC;IAE/C,YAAY,GAAG,IAAI,QAAQ,EAAQ,CAAC;IAEpC,YAAY,OAAsC;QAChD,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,MAAM,cAAc,GAAG,sBAAsB,CAAC,iBAAiB,EAAE,CAAC;QAElE,MAAM,cAAc,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC;YACpD,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;YAC3B,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC;QAErB,IAAI,CAAC,WAAW,CAAC,cAAc,IAAI,cAAc,CAAC,QAAQ,CAAC,CAAC;QAC5D,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,MAAM,EAAE,KAAK,EAAE,IAAI,cAAc,CAAC,MAAM,CAAC;QAChE,IAAI,CAAC,gBAAgB,GAAG,YAAY,CAClC,OAAO,CAAC,eAAe,EACvB,cAAc,CAAC,eAAe,CAC/B,CAAC;QAEF,IAAI,CAAC,YAAY,GAAG,WAAW,CAC7B,OAAO,CAAC,WAAW,EACnB,cAAc,CAAC,WAAW,CAC3B,CAAC;QAEF,IAAI,CAAC,gBAAgB,GAAG,OAAO,CAAC,eAAe;YAC7C,CAAC,CAAC,eAAe,CAAC,OAAO,CAAC,eAAe,CAAC;YAC1C,CAAC,CAAC,SAAS,CAAC;QAEd,IAAI,CAAC,YAAY,CAAC,gBAAgB,CAAC,GAAG,EAAE;YACtC,IAAI,CAAC,UAAU,EAAE,CAAC;QACpB,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;;;;OAKG;IACH,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;IAC9B,CAAC;IAED,IAAI,MAAM,CAAC,MAAgB;QACzB,KAAK,CAAC,MAAM,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;QAExB,MAAM,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC7D,MAAM,OAAO,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;QACnE,IAAI,OAAO,EAAE,CAAC;YACZ,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;YACtB,IAAI,CAAC,YAAY,CAAC,UAAU,EAAE,CAAC;QACjC,CAAC;IACH,CAAC;IAED;;;;OAIG;IACH,IAAI,eAAe;QACjB,OAAO,IAAI,CAAC,gBAAgB,CAAC;IAC/B,CAAC;IAED,IAAI,eAAe,CAAC,eAAuB;QACzC,KAAK,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC;QAE/B,IAAI,eAAe,KAAK,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAC9C,IAAI,CAAC,gBAAgB,GAAG,eAAe,CAAC;YACxC,IAAI,CAAC,YAAY,CAAC,UAAU,EAAE,CAAC;QACjC,CAAC;IACH,CAAC;IAED,IAAI,eAAe;QACjB,OAAO,IAAI,CAAC,gBAAgB;YAC1B,CAAC,CAAC,eAAe,CAAC,IAAI,CAAC,gBAAgB,CAAC;YACxC,CAAC,CAAC,SAAS,CAAC;IAChB,CAAC;IAED,IAAI,eAAe,CAAC,OAA4C;QAC9D,IAAI,CAAC,gBAAgB,GAAG,OAAO,CAAC,CAAC,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QACvE,IAAI,CAAC,YAAY,CAAC,UAAU,EAAE,CAAC;IACjC,CAAC;IAED;;;OAGG;IACH,IAAI,WAAW;QACb,OAAO,IAAI,CAAC,YAAY,CAAC;IAC3B,CAAC;IAED,IAAI,WAAW,CAAC,WAAmB;QACjC,KAAK,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;QAE3B,IAAI,WAAW,KAAK,IAAI,CAAC,YAAY,EAAE,CAAC;YACtC,IAAI,CAAC,YAAY,GAAG,WAAW,CAAC;YAChC,IAAI,CAAC,YAAY,CAAC,UAAU,EAAE,CAAC;QACjC,CAAC;IACH,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;IAED,WAAW,CAAC,QAAgD;QAC1D,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC;QAEzC,IAAI,QAAQ,KAAK,IAAI,CAAC,SAAS,EAAE,CAAC;YAChC,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC;YAC1B,IAAI,EAAE,CAAC,IAAI,CAAC,SAAS,EAAE,MAAM,CAAC,EAAE,CAAC;gBAC/B,IAAI,CAAC,iBAAiB,GAAG,6BAA6B,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YACzE,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,SAAS,CAAC;YAC1C,CAAC;YACD,IAAI,CAAC,YAAY,CAAC,UAAU,EAAE,CAAC;QACjC,CAAC;IACH,CAAC;IAED;;OAEG;IACH,cAAc,CAAC,IAAY;QACzB,MAAM,gBAAgB,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,UAAU,EAAE,CAAC,EAAE,EAAE,CAChE,CAAC,GAAG,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC,IAAI,GAAG,UAAU,CAAC,CAAC,CAAC,IAAI,IAAI,UAAU,CACnE,CAAC;QAEF,OAAO,gBAAgB,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,gBAAgB,CAAC;IAC1E,CAAC;IAED;;OAEG;IACH,cAAc,CAAC,IAAY;QACzB,IAAI,IAAI,KAAK,CAAC,EAAE,CAAC;YACf,OAAO,EAAE,CAAC;QACZ,CAAC;QACD,MAAM,gBAAgB,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;QACnD,IAAI,WAAW,GACb,IAAI,CAAC,OAAO,CACV,gBAAgB,GAAG,IAAI,CAAC,gBAAgB;YACtC,CAAC,CAAC,gBAAgB,GAAG,CAAC;YACtB,CAAC,CAAC,gBAAgB,CACrB,CAAC,QAAQ,EAAE,CAAC;QACf,IAAI,gBAAgB,GAAG,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAC7C,WAAW,GAAG,GAAG,WAAW,GAAG,CAAC;QAClC,CAAC;QAED,OAAO,WAAW,CAAC;IACrB,CAAC;IAED;;;OAGG;IACH,cAAc,CAAC,IAAY;QACzB,MAAM,KAAK,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;QAExC,IAAI,UAAU,GAAG,KAAK,GAAG,IAAI,CAAC,gBAAgB,CAAC;QAC/C,UAAU,GAAG,UAAU,GAAG,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;QAC7C,OAAO,GAAG,GAAG,IAAI,CAAC,YAAY,GAAG,UAAU,CAAC;IAC9C,CAAC;IAED,mBAAmB,CACjB,cAA8D;QAE9D,MAAM,aAAa,GAAG,CACpB,OAAgB,EAChB,UAAkB,EACC,EAAE;YACrB,IAAI,QAAQ,GAAc,CAAC,OAAO,CAAC,CAAC;YACpC,IAAI,OAAO,CAAC,sBAAsB,CAAC,EAAE,CAAC;gBACpC,QAAQ,GAAI,OAAO,CAAC,GAAG,CAAC,UAAU,CAAe,IAAI,CAAC,OAAO,CAAC,CAAC;YACjE,CAAC;YACD,MAAM,IAAI,GAAG,QAAQ,CAAC,MAAM,CAAC;YAC7B,IAAI,IAAI,GAAG,CAAC,EAAE,CAAC;gBACb,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,iBAAiB,CAC5D,IAAI,EACJ,QAAQ,EACR,cAAc,CACf,CAAC;gBACF,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC;oBACpC,IAAI,CAAC;wBACH,MAAM,GAAG,GAAG,sBAAsB,kBAAkB,CAClD,cAAc,CAAC,QAAQ,EAAE;4BACvB,IAAI,EAAE,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC;4BAC/B,IAAI;4BACJ,GAAG,IAAI,CAAC,gBAAgB;4BACxB,GAAG,OAAO;yBACX,CAAC,CACH,EAAE,CAAC;wBACJ,MAAM,KAAK,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;wBACxC,IAAI,CAAC,WAAW,CAAC,GAAG,CAClB,QAAQ,EACR,IAAI,KAAK,CAAC;4BACR,KAAK,EAAE,IAAI,IAAI,CAAC;gCACd,GAAG;gCACH,KAAK;gCACL,MAAM,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,yBAAyB;gCAC7C,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,yBAAyB;6BAC1C,CAAC;yBACH,CAAC,CACH,CAAC;oBACJ,CAAC;oBAAC,OAAO,CAAC,EAAE,CAAC;wBACX,IAAI,CAAC,SAAS,EAAE,CAAC,KAAK,CAAC,8BAA8B,EAAE,CAAC,CAAC,CAAC;wBAC1D,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC;oBAChD,CAAC;gBACH,CAAC;gBACD,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,QAAQ,CAAE,CAAC;YACzC,CAAC;iBAAM,IAAI,IAAI,KAAK,CAAC,EAAE,CAAC;gBACtB,MAAM,aAAa,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,qBAAqB,CAAC,IAAI,QAAQ,CAAC,CAAC,CAAC,CAAC;gBACxE,IAAI,aAAa,CAAC,YAAY,CAAC,EAAE,CAAC;oBAChC,MAAM,KAAK,GAAG,cAAc,CAAC,aAAa,CAAC,YAAY,CAAC,CAAC,CAAC;oBAE1D,IAAI,KAAK,GACP,aAAa,CAAC,WAAW,CAAC,EAAE,KAAK,IAAI,aAAa,CAAC,QAAQ,EAAE,CAAC;oBAChE,IAAI,CAAC,KAAK,IAAI,KAAK,EAAE,CAAC;wBACpB,CAAC,EAAE,KAAK,EAAE,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC;oBAC5B,CAAC;oBACD,IAAI,KAAK,YAAY,KAAK,EAAE,CAAC;wBAC3B,OAAO,KAAK,CAAC;oBACf,CAAC;oBAED,IAAI,OAAO,KAAK,KAAK,UAAU,EAAE,CAAC;wBAChC,OAAO,KAAK,CAAC,aAAa,EAAE,UAAU,CAAU,CAAC;oBACnD,CAAC;gBACH,CAAC;YACH,CAAC;YAED,OAAO,SAAS,CAAC;QACnB,CAAC,CAAC;QAEF,OAAO,aAA8B,CAAC;IACxC,CAAC;IAED;;;OAGG;IACH,UAAU;QACR,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC;IAC3B,CAAC;IAED,MAAM;QACJ,MAAM,MAAM,GAA2C,KAAK,CAAC,MAAM,EAAE,CAAC;QACtE,MAAM,cAAc,GAAG,sBAAsB,CAAC,iBAAiB,EAAE,CAAC;QAClE,IAAI,IAAI,CAAC,QAAQ,KAAK,cAAc,CAAC,QAAQ,EAAE,CAAC;YAC9C,MAAM,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;QAClC,CAAC;QACD,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;QACxB,IACE,MAAM,CAAC,MAAM,KAAK,cAAc,CAAC,MAAM,CAAC,MAAM;YAC9C,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,cAAc,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EACtD,CAAC;YACD,MAAM,CAAC,MAAM,GAAG,CAAC,GAAG,MAAM,CAAC,CAAC;QAC9B,CAAC;QACD,IAAI,IAAI,CAAC,eAAe,KAAK,cAAc,CAAC,eAAe,EAAE,CAAC;YAC5D,MAAM,CAAC,eAAe,GAAG,IAAI,CAAC,eAAe,CAAC;QAChD,CAAC;QACD,IAAI,IAAI,CAAC,WAAW,KAAK,cAAc,CAAC,WAAW,EAAE,CAAC;YACpD,MAAM,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC;QACxC,CAAC;QACD,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAC1B,MAAM,CAAC,eAAe,GAAG,eAAe,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;QAClE,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,MAAM,CAAC,KAA6B;QAClC,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC;QAC/B,OAAO,QAAQ,CAAC,IAAI,CAAC;QAErB,MAAM,SAAS,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC;QACjC,OAAO,SAAS,CAAC,IAAI,CAAC;QAEtB,OAAO,SAAS,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;IACxC,CAAC;IAED,OAAO;QACL,IAAI,CAAC,UAAU,EAAE,CAAC;QAClB,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,CAAC;QAC5B,KAAK,CAAC,OAAO,EAAE,CAAC;IAClB,CAAC;CACF;AAED,MAAM,UAAU,0BAA0B;IACxC,OAAO,IAAI,sBAAsB,CAAC,EAAE,CAAC,CAAC;AACxC,CAAC"}
|
package/package.json
CHANGED
|
@@ -334,6 +334,18 @@ class LayerCollection extends IndexedCollection<Layer> {
|
|
|
334
334
|
return super._remove(layer);
|
|
335
335
|
}
|
|
336
336
|
|
|
337
|
+
protected _move(
|
|
338
|
+
layer: Layer,
|
|
339
|
+
itemIndex: number,
|
|
340
|
+
targetIndex: number,
|
|
341
|
+
): number {
|
|
342
|
+
const target = super._move(layer, itemIndex, targetIndex);
|
|
343
|
+
if (itemIndex !== target) {
|
|
344
|
+
this._ensureLocalZIndex(layer);
|
|
345
|
+
}
|
|
346
|
+
return target;
|
|
347
|
+
}
|
|
348
|
+
|
|
337
349
|
clear(): void {
|
|
338
350
|
Object.values(this._layerEventListeners)
|
|
339
351
|
.flat()
|
|
@@ -41,7 +41,10 @@ export default class VectorClusterStyleItem extends VcsObject {
|
|
|
41
41
|
return 'VectorClusterStyleItem';
|
|
42
42
|
}
|
|
43
43
|
|
|
44
|
-
static getDefaultOptions(): Required<
|
|
44
|
+
static getDefaultOptions(): Required<
|
|
45
|
+
Omit<VectorClusterStyleItemOptions, 'templateContext'>
|
|
46
|
+
> &
|
|
47
|
+
Pick<VectorClusterStyleItemOptions, 'templateContext'> {
|
|
45
48
|
return {
|
|
46
49
|
type: 'VectorClusterStyleItem',
|
|
47
50
|
name: '',
|
|
@@ -69,7 +72,7 @@ export default class VectorClusterStyleItem extends VcsObject {
|
|
|
69
72
|
' </text>',
|
|
70
73
|
'</svg>',
|
|
71
74
|
].join(''),
|
|
72
|
-
templateContext:
|
|
75
|
+
templateContext: undefined,
|
|
73
76
|
breaks: [2, 3, 4, 5, 10, 15, 20, 25],
|
|
74
77
|
zeroScaleOffset: 3,
|
|
75
78
|
scaleFactor: 0.08,
|
|
@@ -342,7 +345,7 @@ export default class VectorClusterStyleItem extends VcsObject {
|
|
|
342
345
|
breaks.length !== defaultOptions.breaks.length ||
|
|
343
346
|
breaks.some((b) => !defaultOptions.breaks.includes(b))
|
|
344
347
|
) {
|
|
345
|
-
config.breaks = breaks;
|
|
348
|
+
config.breaks = [...breaks];
|
|
346
349
|
}
|
|
347
350
|
if (this.zeroScaleOffset !== defaultOptions.zeroScaleOffset) {
|
|
348
351
|
config.zeroScaleOffset = this.zeroScaleOffset;
|