@vcmap/core 6.0.7 → 6.1.0-rc.1

package/dist/src/vectorCluster/vectorClusterStyleItem.js

@@ -0,0 +1,374 @@
+import Style from 'ol/style/Style.js';
+import Icon from 'ol/style/Icon.js';
+import { check, is, oneOf } from '@vcsuite/check';
+import { parseInteger, parseNumber } from '@vcsuite/parsers';
+import deepEqual from 'fast-deep-equal';
+import { originalFeatureSymbol } from '../layer/vectorSymbols.js';
+import { highlighted } from '../layer/featureVisibility.js';
+import VcsObject from '../vcsObject.js';
+import VcsEvent from '../vcsEvent.js';
+import { renderTemplate } from '../util/vcsTemplate.js';
+import { vectorClusterGroupName } from './vectorClusterSymbols.js';
+import { vcsLayerName } from '../layer/layerSymbols.js';
+function createDefaultTemplateFunction(template) {
+    return (styleItem, features) => ({
+        template,
+        cacheKey: String(styleItem.findBreakIndex(features.length)),
+    });
+}
+export default class VectorClusterStyleItem extends VcsObject {
+    static get className() {
+        return 'VectorClusterStyleItem';
+    }
+    static getDefaultOptions() {
+        return {
+            type: 'VectorClusterStyleItem',
+            name: '',
+            properties: {},
+            template: [
+                '<svg width="64" height="64" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">',
+                ' <defs><style>',
+                '  .cls-1 {',
+                '   fill: {{ fillColor }};',
+                '   stroke: {{ strokeColor }};',
+                '   stroke-miterlimit: 10;',
+                '   stroke-width: {{ strokeWidth }}px;',
+                ' }',
+                ' .text {',
+                '   font: {{ font }};',
+                '   fill: {{ textColor }};',
+                '   text-anchor: middle;',
+                '   alignment-baseline: middle;',
+                '   dominant-baseline: middle;',
+                ' }',
+                ' </style></defs>',
+                ' <circle id="outer" class="cls-1" cx="32" cy="32" r="30"/>',
+                ' <text x="32" y="32" class="text">',
+                '   {{ text }}',
+                ' </text>',
+                '</svg>',
+            ].join(''),
+            fillColor: '#ffffff',
+            strokeColor: '#2a2a2a',
+            strokeWidth: 4,
+            textColor: '#2a2a2a',
+            font: 'normal normal 700 32px Calibri-Bold,Calibri',
+            breaks: [2, 3, 4, 5, 10, 15, 20, 25],
+            zeroScaleOffset: 3,
+            scaleFactor: 0.08,
+        };
+    }
+    _template = '';
+    _templateFunction = createDefaultTemplateFunction('');
+    _breaks = [];
+    _zeroScaleOffset;
+    _fillColor;
+    _strokeColor;
+    _strokeWidth;
+    _textColor;
+    _font;
+    _scaleFactor;
+    _styleCache = new Map();
+    styleChanged = new VcsEvent();
+    constructor(options) {
+        super(options);
+        const defaultOptions = VectorClusterStyleItem.getDefaultOptions();
+        const configTemplate = Array.isArray(options.template)
+            ? options.template.join('')
+            : options.template;
+        this.setTemplate(configTemplate ?? defaultOptions.template);
+        this._breaks = options.breaks?.slice() ?? defaultOptions.breaks;
+        this._zeroScaleOffset = parseInteger(options.zeroScaleOffset, defaultOptions.zeroScaleOffset);
+        this._fillColor = options.fillColor ?? defaultOptions.fillColor;
+        this._strokeColor = options.strokeColor ?? defaultOptions.strokeColor;
+        this._strokeWidth = parseNumber(options.strokeWidth, defaultOptions.strokeWidth);
+        this._textColor = options.textColor ?? defaultOptions.textColor;
+        this._font = options.font ?? defaultOptions.font;
+        this._scaleFactor = parseNumber(options.scaleFactor, defaultOptions.scaleFactor);
+        this.styleChanged.addEventListener(() => {
+            this.clearCache();
+        });
+    }
+    /**
+     * An array of cluster sizes to break at. Typically the first couple of sizes are
+     * a series (meaning: not grouped). Later breaks are non sequential and used for grouping
+     * clusters larger. [2, 3, 4, 5, 10] would start grouping at clusters larger or equal 5
+     * entries.
+     */
+    get breaks() {
+        return this._breaks.slice();
+    }
+    set breaks(breaks) {
+        check(breaks, [Number]);
+        const sortedBreaks = breaks.sort((a, b) => (a < b ? -1 : 1));
+        const changed = sortedBreaks.find((b, i) => b !== this._breaks[i]);
+        if (changed) {
+            this._breaks = breaks;
+            this.styleChanged.raiseEvent();
+        }
+    }
+    /**
+     * The index of breaks to st. for indexes [2, 3, 4, 5, 10] and a zeroScale offset of 3
+     * would lead to icons 2, 3, 4 having the same size and no "+" attached. 5 and 10
+     * would be scaled by the scale factor and a "+" added to the text
+     */
+    get zeroScaleOffset() {
+        return this._zeroScaleOffset;
+    }
+    set zeroScaleOffset(zeroScaleOffset) {
+        check(zeroScaleOffset, Number);
+        if (zeroScaleOffset !== this._zeroScaleOffset) {
+            this._zeroScaleOffset = zeroScaleOffset;
+            this.styleChanged.raiseEvent();
+        }
+    }
+    /**
+     * The fill color. This must be a css string.
+     */
+    get fillColor() {
+        return this._fillColor;
+    }
+    set fillColor(fillColor) {
+        check(fillColor, String);
+        if (fillColor !== this._fillColor) {
+            this._fillColor = fillColor;
+            this.styleChanged.raiseEvent();
+        }
+    }
+    /**
+     * The stroke color. This must be a css string.
+     */
+    get strokeColor() {
+        return this._strokeColor;
+    }
+    set strokeColor(strokeColor) {
+        check(strokeColor, String);
+        if (strokeColor !== this._strokeColor) {
+            this._strokeColor = strokeColor;
+            this.styleChanged.raiseEvent();
+        }
+    }
+    /**
+     * The stroke color. This must be a css string.
+     */
+    get strokeWidth() {
+        return this._strokeWidth;
+    }
+    set strokeWidth(strokeWidth) {
+        check(strokeWidth, Number);
+        if (strokeWidth !== this._strokeWidth) {
+            this._strokeWidth = strokeWidth;
+            this.styleChanged.raiseEvent();
+        }
+    }
+    /**
+     * The text color. This must be a css string.
+     */
+    get textColor() {
+        return this._textColor;
+    }
+    set textColor(textColor) {
+        check(textColor, String);
+        if (textColor !== this._textColor) {
+            this._textColor = textColor;
+            this.styleChanged.raiseEvent();
+        }
+    }
+    /**
+     * The font to use. Must be css font attribute.
+     */
+    get font() {
+        return this._font;
+    }
+    set font(font) {
+        check(font, String);
+        if (font !== this._font) {
+            this._font = font;
+            this.styleChanged.raiseEvent();
+        }
+    }
+    /**
+     * The factor by which to multiply the index of the used break grouping
+     * (subtracted by the zeroScaleOffset)
+     */
+    get scaleFactor() {
+        return this._scaleFactor;
+    }
+    set scaleFactor(scaleFactor) {
+        check(scaleFactor, Number);
+        if (scaleFactor !== this._scaleFactor) {
+            this._scaleFactor = scaleFactor;
+            this.styleChanged.raiseEvent();
+        }
+    }
+    get template() {
+        return this._template;
+    }
+    setTemplate(template) {
+        check(template, oneOf(String, Function));
+        if (template !== this._template) {
+            this._template = template;
+            if (is(this._template, String)) {
+                this._templateFunction = createDefaultTemplateFunction(this._template);
+            }
+            else {
+                this._templateFunction = this._template;
+            }
+            this.styleChanged.raiseEvent();
+        }
+    }
+    /**
+     * Finds the breaks index of a specified cluster size.
+     */
+    findBreakIndex(size) {
+        const clusterTextIndex = this._breaks.findIndex((classBreak, i) => i > this._zeroScaleOffset ? size < classBreak : size <= classBreak);
+        return clusterTextIndex === -1 ? this._breaks.length : clusterTextIndex;
+    }
+    /**
+     * Gets the cluster text based on breaks and zeroScaleOffset. Adds a + to all sizes with an index larger then the zeroScaleOffset.
+     */
+    getClusterText(size) {
+        if (size === 1) {
+            return '';
+        }
+        const clusterTextIndex = this.findBreakIndex(size);
+        let clusterText = this._breaks[clusterTextIndex > this._zeroScaleOffset
+            ? clusterTextIndex - 1
+            : clusterTextIndex].toString();
+        if (clusterTextIndex > this._zeroScaleOffset) {
+            clusterText = `${clusterText}+`;
+        }
+        return clusterText;
+    }
+    /**
+     * Determines the scale based on break index and zeroScaleOffset. Cluster sizes with an index less then zeroScaleOffset
+     * are not scaled.
+     */
+    determineScale(size) {
+        const index = this.findBreakIndex(size);
+        let indexScale = index - this._zeroScaleOffset;
+        indexScale = indexScale > 0 ? indexScale : 0;
+        return 0.6 + this._scaleFactor * indexScale;
+    }
+    createStyleFunction(getLayerByName) {
+        const styleFunction = (feature, resolution) => {
+            let features = [feature];
+            if (feature[vectorClusterGroupName]) {
+                features = feature.get('features') ?? [feature];
+            }
+            const size = features.length;
+            if (size > 1) {
+                const { template, cacheKey, context } = this._templateFunction(this, features, getLayerByName);
+                if (!this._styleCache.has(cacheKey)) {
+                    try {
+                        const src = `data:image/svg+xml,${encodeURIComponent(renderTemplate(template, {
+                            // XXX document what parameters are past to the object
+                            text: this.getClusterText(size),
+                            fillColor: this._fillColor,
+                            strokeColor: this._strokeColor,
+                            strokeWidth: this._strokeWidth,
+                            textColor: this._textColor,
+                            font: this._font,
+                            size,
+                            ...context,
+                        }))}`;
+                        const scale = this.determineScale(size);
+                        this._styleCache.set(cacheKey, new Style({
+                            image: new Icon({
+                                src,
+                                scale,
+                                anchor: [0.5, 0.5], // XXX make configurable?
+                                size: [64, 64], // XXX make configurable?
+                            }),
+                        }));
+                    }
+                    catch (e) {
+                        this.getLogger().error('Error creating cluster style', e);
+                        this._styleCache.set(cacheKey, new Style({}));
+                    }
+                }
+                return this._styleCache.get(cacheKey);
+            }
+            else if (size === 1) {
+                const singleFeature = features[0][originalFeatureSymbol] || features[0];
+                if (singleFeature[vcsLayerName]) {
+                    const layer = getLayerByName(singleFeature[vcsLayerName]);
+                    let style = singleFeature[highlighted]?.style ?? singleFeature.getStyle();
+                    if (!style && layer) {
+                        ({ style } = layer.style);
+                    }
+                    if (style instanceof Style) {
+                        return style;
+                    }
+                    if (typeof style === 'function') {
+                        return style(singleFeature, resolution);
+                    }
+                }
+            }
+            return undefined;
+        };
+        return styleFunction;
+    }
+    /**
+     * Clears the style cache to ensure new changes can take effect.
+     * @api
+     */
+    clearCache() {
+        this._styleCache.clear();
+    }
+    toJSON() {
+        const config = super.toJSON();
+        const defaultOptions = VectorClusterStyleItem.getDefaultOptions();
+        if (this.template !== defaultOptions.template) {
+            config.template = this.template;
+        }
+        if (this.fillColor !== defaultOptions.fillColor) {
+            config.fillColor = this.fillColor;
+        }
+        if (this.strokeColor !== defaultOptions.strokeColor) {
+            config.strokeColor = this.strokeColor;
+        }
+        if (this.strokeWidth !== defaultOptions.strokeWidth) {
+            config.strokeWidth = this.strokeWidth;
+        }
+        if (this.textColor !== defaultOptions.textColor) {
+            config.textColor = this.textColor;
+        }
+        if (this.font !== defaultOptions.font) {
+            config.font = this.font;
+        }
+        const { breaks } = this;
+        if (breaks.length !== defaultOptions.breaks.length ||
+            breaks.some((b) => !defaultOptions.breaks.includes(b))) {
+            config.breaks = breaks;
+        }
+        if (this.zeroScaleOffset !== defaultOptions.zeroScaleOffset) {
+            config.zeroScaleOffset = this.zeroScaleOffset;
+        }
+        if (this.scaleFactor !== defaultOptions.scaleFactor) {
+            config.scaleFactor = this.scaleFactor;
+        }
+        return config;
+    }
+    equals(other) {
+        const thisJson = this.toJSON();
+        delete thisJson.name;
+        const otherJson = other.toJSON();
+        delete otherJson.name;
+        return deepEqual(thisJson, otherJson);
+    }
+    destroy() {
+        this.clearCache();
+        this.styleChanged.destroy();
+        super.destroy();
+    }
+}
+export function getDefaultClusterStyleItem() {
+    return new VectorClusterStyleItem({});
+}
+export function getDefaultClusterHighlightStyleItem() {
+    return new VectorClusterStyleItem({
+        fillColor: '#409D76',
+    });
+}
+//# sourceMappingURL=vectorClusterStyleItem.js.map

package/dist/src/vectorCluster/vectorClusterStyleItem.js.map

@@ -0,0 +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;AAoBxD,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;QACtB,OAAO;YACL,IAAI,EAAE,wBAAwB;YAC9B,IAAI,EAAE,EAAE;YACR,UAAU,EAAE,EAAE;YACd,QAAQ,EAAE;gBACR,qFAAqF;gBACrF,gBAAgB;gBAChB,YAAY;gBACZ,2BAA2B;gBAC3B,+BAA+B;gBAC/B,2BAA2B;gBAC3B,uCAAuC;gBACvC,IAAI;gBACJ,UAAU;gBACV,sBAAsB;gBACtB,2BAA2B;gBAC3B,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,SAAS,EAAE,SAAS;YACpB,WAAW,EAAE,SAAS;YACtB,WAAW,EAAE,CAAC;YACd,SAAS,EAAE,SAAS;YACpB,IAAI,EAAE,6CAA6C;YACnD,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,UAAU,CAAS;IAEnB,YAAY,CAAS;IAErB,YAAY,CAAS;IAErB,UAAU,CAAS;IAEnB,KAAK,CAAS;IAEd,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;QACF,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC,SAAS,IAAI,cAAc,CAAC,SAAS,CAAC;QAChE,IAAI,CAAC,YAAY,GAAG,OAAO,CAAC,WAAW,IAAI,cAAc,CAAC,WAAW,CAAC;QACtE,IAAI,CAAC,YAAY,GAAG,WAAW,CAC7B,OAAO,CAAC,WAAW,EACnB,cAAc,CAAC,WAAW,CAC3B,CAAC;QACF,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC,SAAS,IAAI,cAAc,CAAC,SAAS,CAAC;QAChE,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC,IAAI,IAAI,cAAc,CAAC,IAAI,CAAC;QACjD,IAAI,CAAC,YAAY,GAAG,WAAW,CAC7B,OAAO,CAAC,WAAW,EACnB,cAAc,CAAC,WAAW,CAC3B,CAAC;QAEF,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;;OAEG;IACH,IAAI,SAAS;QACX,OAAO,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC;IAED,IAAI,SAAS,CAAC,SAAiB;QAC7B,KAAK,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;QAEzB,IAAI,SAAS,KAAK,IAAI,CAAC,UAAU,EAAE,CAAC;YAClC,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;YAC5B,IAAI,CAAC,YAAY,CAAC,UAAU,EAAE,CAAC;QACjC,CAAC;IACH,CAAC;IAED;;OAEG;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;;OAEG;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;;OAEG;IACH,IAAI,SAAS;QACX,OAAO,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC;IAED,IAAI,SAAS,CAAC,SAAiB;QAC7B,KAAK,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;QAEzB,IAAI,SAAS,KAAK,IAAI,CAAC,UAAU,EAAE,CAAC;YAClC,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;YAC5B,IAAI,CAAC,YAAY,CAAC,UAAU,EAAE,CAAC;QACjC,CAAC;IACH,CAAC;IAED;;OAEG;IACH,IAAI,IAAI;QACN,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAED,IAAI,IAAI,CAAC,IAAY;QACnB,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAEpB,IAAI,IAAI,KAAK,IAAI,CAAC,KAAK,EAAE,CAAC;YACxB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;YAClB,IAAI,CAAC,YAAY,CAAC,UAAU,EAAE,CAAC;QACjC,CAAC;IACH,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,sDAAsD;4BACtD,IAAI,EAAE,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC;4BAC/B,SAAS,EAAE,IAAI,CAAC,UAAU;4BAC1B,WAAW,EAAE,IAAI,CAAC,YAAY;4BAC9B,WAAW,EAAE,IAAI,CAAC,YAAY;4BAC9B,SAAS,EAAE,IAAI,CAAC,UAAU;4BAC1B,IAAI,EAAE,IAAI,CAAC,KAAK;4BAChB,IAAI;4BACJ,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,IAAI,IAAI,CAAC,SAAS,KAAK,cAAc,CAAC,SAAS,EAAE,CAAC;YAChD,MAAM,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;QACpC,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,WAAW,KAAK,cAAc,CAAC,WAAW,EAAE,CAAC;YACpD,MAAM,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC;QACxC,CAAC;QACD,IAAI,IAAI,CAAC,SAAS,KAAK,cAAc,CAAC,SAAS,EAAE,CAAC;YAChD,MAAM,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;QACpC,CAAC;QACD,IAAI,IAAI,CAAC,IAAI,KAAK,cAAc,CAAC,IAAI,EAAE,CAAC;YACtC,MAAM,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;QAC1B,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,MAAM,CAAC;QACzB,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;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;AAED,MAAM,UAAU,mCAAmC;IACjD,OAAO,IAAI,sBAAsB,CAAC;QAChC,SAAS,EAAE,SAAS;KACrB,CAAC,CAAC;AACL,CAAC"}

package/dist/src/vectorCluster/vectorClusterSymbols.d.ts

@@ -0,0 +1 @@
+export declare const vectorClusterGroupName: unique symbol;

package/dist/src/vectorCluster/vectorClusterSymbols.js

@@ -0,0 +1,3 @@
+// eslint-disable-next-line import/prefer-default-export
+export const vectorClusterGroupName = Symbol('vectorClusterGroupName');
+//# sourceMappingURL=vectorClusterSymbols.js.map

package/dist/src/vectorCluster/vectorClusterSymbols.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"vectorClusterSymbols.js","sourceRoot":"","sources":["../../../src/vectorCluster/vectorClusterSymbols.ts"],"names":[],"mappings":"AAAA,wDAAwD;AACxD,MAAM,CAAC,MAAM,sBAAsB,GAAG,MAAM,CAAC,wBAAwB,CAAC,CAAC"}

package/index.ts

@@ -62,7 +62,6 @@ export {
   getExtentFromTileset,
   default as CesiumTilesetCesiumImpl,
 } from './src/layer/cesium/cesiumTilesetCesiumImpl.js';
-export { default as ClusterContext } from './src/layer/cesium/clusterContext.js';
 export { default as DataSourceCesiumImpl } from './src/layer/cesium/dataSourceCesiumImpl.js';
 export { default as OpenStreetMapCesiumImpl } from './src/layer/cesium/openStreetMapCesiumImpl.js';
 export { default as RasterLayerCesiumImpl } from './src/layer/cesium/rasterLayerCesiumImpl.js';
@@ -105,6 +104,10 @@ export {
   getTileHash,
   getTileWgs84Extent,
 } from './src/layer/cesium/vcsTile/vcsTileHelpers.js';
+export {
+  createSourceVectorContextSync,
+  SourceVectorContextSync,
+} from './src/layer/cesium/sourceVectorContextSync.js';
 export { default as CzmlLayer, CzmlOptions } from './src/layer/czmlLayer.js';
 export {
   default as DataSourceLayer,
@@ -183,6 +186,10 @@ export {
   setNewGeometry,
 } from './src/layer/oblique/obliqueHelpers.js';
 export { default as VectorObliqueImpl } from './src/layer/oblique/vectorObliqueImpl.js';
+export {
+  createSourceObliqueSync,
+  SourceObliqueSync,
+} from './src/layer/oblique/sourceObliqueSync.js';
 export {
   default as OpenStreetMapLayer,
   OpenStreetMapOptions,
@@ -257,6 +264,28 @@ export {
   default as URLTemplateTileProvider,
   URLTemplateTileProviderOptions,
 } from './src/layer/tileProvider/urlTemplateTileProvider.js';
+export {
+  default as ClusterContext,
+  default as VectorClusterCesiumContext,
+} from './src/vectorCluster/vectorClusterCesiumContext.js';
+export {
+  default as VectorClusterStyleItem,
+  VectorClusterStyleItemOptions,
+  VectorClusterTemplateFunction,
+  getDefaultClusterStyleItem,
+  getDefaultClusterHighlightStyleItem,
+} from './src/vectorCluster/vectorClusterStyleItem.js';
+export { default as VectorClusterGroupCesiumImpl } from './src/vectorCluster/vectorClusterGroupCesiumImpl.js';
+export { default as VectorClusterGroupOpenlayersImpl } from './src/vectorCluster/vectorClusterGroupOpenlayersImpl.js';
+export {
+  default as VectorClusterGroup,
+  VectorClusterGroupOptions,
+  VectorClusterGroupImplementationOptions,
+} from './src/vectorCluster/vectorClusterGroup.js';
+export { default as VectorClusterGroupImpl } from './src/vectorCluster/vectorClusterGroupImpl.js';
+export { default as VectorClusterGroupObliqueImpl } from './src/vectorCluster/vectorClusterGroupObliqueImpl.js';
+export { default as VectorClusterGroupCollection } from './src/vectorCluster/vectorClusterGroupCollection.js';
+export { vectorClusterGroupName } from './src/vectorCluster/vectorClusterSymbols.js';
 export {
   default as TMSLayer,
   TMSOptions,
@@ -833,3 +862,8 @@ export {
 } from './src/util/flight/flightVisualizer.js';
 export { getTileLoadFunction } from './src/layer/openlayers/loadFunctionHelpers.js';
 export { default as ModelFill } from './src/style/modelFill.js';
+export { renderTemplate } from './src/util/vcsTemplate.js';
+export {
+  startRotation,
+  rotationMapControlSymbol,
+} from './src/util/rotation.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vcmap/core",
-  "version": "6.0.7",
+  "version": "6.1.0-rc.1",
   "description": "",
   "main": "dist/index.js",
   "type": "module",
@@ -39,6 +39,7 @@
   "license": "MIT",
   "devDependencies": {
     "@types/chai": "^4.3.16",
+    "@types/chai-as-promised": "^8.0.1",
     "@types/geojson": "^7946.0.10",
     "@types/mocha": "^10.0.7",
     "@types/node": "^20.16.5",
@@ -50,6 +51,7 @@
     "c8": "^10.1.2",
     "canvas": "^2.11.2",
     "chai": "^4.4.1",
+    "chai-as-promised": "^8.0.1",
     "eslint": "^8.38.0",
     "jsdom": "^24.1.0",
     "jsdom-global": "^3.0.2",

package/src/cesium/cesium.d.ts

@@ -27,6 +27,7 @@ import {
   updateFeatureOverride,
 } from '../layer/cesium/cesiumTilesetCesiumImpl.js';
 import { isTiledFeature } from '../layer/featureStoreLayer.js';
+import { vectorClusterGroupName } from '../vectorCluster/vectorClusterSymbols.js';
 
 declare module '@vcmap-cesium/engine' {
   interface Scene {
@@ -61,6 +62,7 @@ declare module '@vcmap-cesium/engine' {
     getPropertyInherited(key: string): any;
     getAttributes(): Record<string, unknown>;
     [vcsLayerName]?: string;
+    [vectorClusterGroupName]?: string;
     [globalHidden]?: boolean;
     [hidden]?: boolean;
     [highlighted]?: VectorStyleItem;
@@ -112,6 +114,7 @@ declare module '@vcmap-cesium/engine' {
 
   interface CustomDataSource {
     [vcsLayerName]?: string;
+    [vectorClusterGroupName]?: string;
   }
 
   interface CzmlDataSource {

package/src/interaction/abstractInteraction.ts

@@ -58,6 +58,10 @@ export type InteractionEvent = MapEvent & {
    * a potential feature at said location
    */
   feature?: EventFeature;
+  /**
+   * further features at said location. includes .feature
+   */
+  features?: EventFeature[];
   /**
    * if set to true, the event chain is interrupted
    */