ol 9.0.0-dev.1707154322322 → 9.0.0-dev.1707413332477

package/renderer/vector.js

@@ -70,15 +70,8 @@ export function getTolerance(resolution, pixelRatio) {
  * @param {import("../geom/Circle.js").default} geometry Geometry.
  * @param {import("../style/Style.js").default} style Style.
  * @param {import("../Feature.js").default} feature Feature.
- * @param {import("../render/canvas/BuilderGroup.js").default} [declutterBuilderGroup] Builder for decluttering.
  */
-function renderCircleGeometry(
-  builderGroup,
-  geometry,
-  style,
-  feature,
-  declutterBuilderGroup,
-) {
+function renderCircleGeometry(builderGroup, geometry, style, feature) {
   const fillStyle = style.getFill();
   const strokeStyle = style.getStroke();
   if (fillStyle || strokeStyle) {
@@ -88,10 +81,7 @@ function renderCircleGeometry(
   }
   const textStyle = style.getText();
   if (textStyle && textStyle.getText()) {
-    const textReplay = (declutterBuilderGroup || builderGroup).getBuilder(
-      style.getZIndex(),
-      'Text',
-    );
+    const textReplay = builderGroup.getBuilder(style.getZIndex(), 'Text');
     textReplay.setTextStyle(textStyle);
     textReplay.drawText(geometry, feature);
   }
@@ -104,7 +94,8 @@ function renderCircleGeometry(
  * @param {number} squaredTolerance Squared tolerance.
  * @param {function(import("../events/Event.js").default): void} listener Listener function.
  * @param {import("../proj.js").TransformFunction} [transform] Transform from user to view projection.
- * @param {import("../render/canvas/BuilderGroup.js").default} [declutterBuilderGroup] Builder for decluttering.
+ * @param {boolean} [declutter] Enable decluttering.
+ * @param {number} [index] Render order index..
  * @return {boolean} `true` if style is loading.
  */
 export function renderFeature(
@@ -114,7 +105,8 @@ export function renderFeature(
   squaredTolerance,
   listener,
   transform,
-  declutterBuilderGroup,
+  declutter,
+  index,
 ) {
   const loadingPromises = [];
   const imageStyle = style.getImage();
@@ -146,7 +138,8 @@ export function renderFeature(
     style,
     squaredTolerance,
     transform,
-    declutterBuilderGroup,
+    declutter,
+    index,
   );
 
   return loading;
@@ -158,7 +151,8 @@ export function renderFeature(
  * @param {import("../style/Style.js").default} style Style.
  * @param {number} squaredTolerance Squared tolerance.
  * @param {import("../proj.js").TransformFunction} [transform] Optional transform function.
- * @param {import("../render/canvas/BuilderGroup.js").default} [declutterBuilderGroup] Builder for decluttering.
+ * @param {boolean} [declutter] Enable decluttering.
+ * @param {number} [index] Render order index..
  */
 function renderFeatureInternal(
   replayGroup,
@@ -166,7 +160,8 @@ function renderFeatureInternal(
   style,
   squaredTolerance,
   transform,
-  declutterBuilderGroup,
+  declutter,
+  index,
 ) {
   const geometry = style.getGeometryFunction()(feature);
   if (!geometry) {
@@ -178,7 +173,7 @@ function renderFeatureInternal(
   );
   const renderer = style.getRenderer();
   if (renderer) {
-    renderGeometry(replayGroup, simplifiedGeometry, style, feature);
+    renderGeometry(replayGroup, simplifiedGeometry, style, feature, index);
   } else {
     const geometryRenderer = GEOMETRY_RENDERERS[simplifiedGeometry.getType()];
     geometryRenderer(
@@ -186,7 +181,8 @@ function renderFeatureInternal(
       simplifiedGeometry,
       style,
       feature,
-      declutterBuilderGroup,
+      index,
+      declutter,
     );
   }
 }
@@ -196,15 +192,16 @@ function renderFeatureInternal(
  * @param {import("../geom/Geometry.js").default|import("../render/Feature.js").default} geometry Geometry.
  * @param {import("../style/Style.js").default} style Style.
  * @param {import("../Feature.js").FeatureLike} feature Feature.
+ * @param {number} [index] Render order index.
  */
-function renderGeometry(replayGroup, geometry, style, feature) {
+function renderGeometry(replayGroup, geometry, style, feature, index) {
   if (geometry.getType() == 'GeometryCollection') {
     const geometries =
       /** @type {import("../geom/GeometryCollection.js").default} */ (
         geometry
       ).getGeometries();
     for (let i = 0, ii = geometries.length; i < ii; ++i) {
-      renderGeometry(replayGroup, geometries[i], style, feature);
+      renderGeometry(replayGroup, geometries[i], style, feature, index);
     }
     return;
   }
@@ -214,6 +211,7 @@ function renderGeometry(replayGroup, geometry, style, feature) {
     feature,
     style.getRenderer(),
     style.getHitDetectionRenderer(),
+    index,
   );
 }
 
@@ -223,6 +221,7 @@ function renderGeometry(replayGroup, geometry, style, feature) {
  * @param {import("../style/Style.js").default} style Style.
  * @param {import("../Feature.js").default} feature Feature.
  * @param {import("../render/canvas/BuilderGroup.js").default} [declutterBuilderGroup] Builder for decluttering.
+ * @param {number} [index] Render order index.
  */
 function renderGeometryCollectionGeometry(
   replayGroup,
@@ -230,6 +229,7 @@ function renderGeometryCollectionGeometry(
   style,
   feature,
   declutterBuilderGroup,
+  index,
 ) {
   const geometries = geometry.getGeometriesArray();
   let i, ii;
@@ -241,6 +241,7 @@ function renderGeometryCollectionGeometry(
       style,
       feature,
       declutterBuilderGroup,
+      index,
     );
   }
 }
@@ -250,14 +251,14 @@ function renderGeometryCollectionGeometry(
  * @param {import("../geom/LineString.js").default|import("../render/Feature.js").default} geometry Geometry.
  * @param {import("../style/Style.js").default} style Style.
  * @param {import("../Feature.js").FeatureLike} feature Feature.
- * @param {import("../render/canvas/BuilderGroup.js").default} [declutterBuilderGroup] Builder for decluttering.
+ * @param {number} [index] Render order index.
  */
 function renderLineStringGeometry(
   builderGroup,
   geometry,
   style,
   feature,
-  declutterBuilderGroup,
+  index,
 ) {
   const strokeStyle = style.getStroke();
   if (strokeStyle) {
@@ -266,16 +267,13 @@ function renderLineStringGeometry(
       'LineString',
     );
     lineStringReplay.setFillStrokeStyle(null, strokeStyle);
-    lineStringReplay.drawLineString(geometry, feature);
+    lineStringReplay.drawLineString(geometry, feature, index);
   }
   const textStyle = style.getText();
   if (textStyle && textStyle.getText()) {
-    const textReplay = (declutterBuilderGroup || builderGroup).getBuilder(
-      style.getZIndex(),
-      'Text',
-    );
+    const textReplay = builderGroup.getBuilder(style.getZIndex(), 'Text');
     textReplay.setTextStyle(textStyle);
-    textReplay.drawText(geometry, feature);
+    textReplay.drawText(geometry, feature, index);
   }
 }
 
@@ -284,14 +282,14 @@ function renderLineStringGeometry(
  * @param {import("../geom/MultiLineString.js").default|import("../render/Feature.js").default} geometry Geometry.
  * @param {import("../style/Style.js").default} style Style.
  * @param {import("../Feature.js").FeatureLike} feature Feature.
- * @param {import("../render/canvas/BuilderGroup.js").default} [declutterBuilderGroup] Builder for decluttering.
+ * @param {number} [index] Render order index.
  */
 function renderMultiLineStringGeometry(
   builderGroup,
   geometry,
   style,
   feature,
-  declutterBuilderGroup,
+  index,
 ) {
   const strokeStyle = style.getStroke();
   if (strokeStyle) {
@@ -300,16 +298,13 @@ function renderMultiLineStringGeometry(
       'LineString',
     );
     lineStringReplay.setFillStrokeStyle(null, strokeStyle);
-    lineStringReplay.drawMultiLineString(geometry, feature);
+    lineStringReplay.drawMultiLineString(geometry, feature, index);
   }
   const textStyle = style.getText();
   if (textStyle && textStyle.getText()) {
-    const textReplay = (declutterBuilderGroup || builderGroup).getBuilder(
-      style.getZIndex(),
-      'Text',
-    );
+    const textReplay = builderGroup.getBuilder(style.getZIndex(), 'Text');
     textReplay.setTextStyle(textStyle);
-    textReplay.drawText(geometry, feature);
+    textReplay.drawText(geometry, feature, index);
   }
 }
 
@@ -318,30 +313,27 @@ function renderMultiLineStringGeometry(
  * @param {import("../geom/MultiPolygon.js").default} geometry Geometry.
  * @param {import("../style/Style.js").default} style Style.
  * @param {import("../Feature.js").default} feature Feature.
- * @param {import("../render/canvas/BuilderGroup.js").default} [declutterBuilderGroup] Builder for decluttering.
+ * @param {number} [index] Render order index.
  */
 function renderMultiPolygonGeometry(
   builderGroup,
   geometry,
   style,
   feature,
-  declutterBuilderGroup,
+  index,
 ) {
   const fillStyle = style.getFill();
   const strokeStyle = style.getStroke();
   if (strokeStyle || fillStyle) {
     const polygonReplay = builderGroup.getBuilder(style.getZIndex(), 'Polygon');
     polygonReplay.setFillStrokeStyle(fillStyle, strokeStyle);
-    polygonReplay.drawMultiPolygon(geometry, feature);
+    polygonReplay.drawMultiPolygon(geometry, feature, index);
   }
   const textStyle = style.getText();
   if (textStyle && textStyle.getText()) {
-    const textReplay = (declutterBuilderGroup || builderGroup).getBuilder(
-      style.getZIndex(),
-      'Text',
-    );
+    const textReplay = builderGroup.getBuilder(style.getZIndex(), 'Text');
     textReplay.setTextStyle(textStyle);
-    textReplay.drawText(geometry, feature);
+    textReplay.drawText(geometry, feature, index);
   }
 }
 
@@ -350,56 +342,35 @@ function renderMultiPolygonGeometry(
  * @param {import("../geom/Point.js").default|import("../render/Feature.js").default} geometry Geometry.
  * @param {import("../style/Style.js").default} style Style.
  * @param {import("../Feature.js").FeatureLike} feature Feature.
- * @param {import("../render/canvas/BuilderGroup.js").default} [declutterBuilderGroup] Builder for decluttering.
+ * @param {number} [index] Render order index.
+ * @param {boolean} [declutter] Enable decluttering.
  */
 function renderPointGeometry(
   builderGroup,
   geometry,
   style,
   feature,
-  declutterBuilderGroup,
+  index,
+  declutter,
 ) {
   const imageStyle = style.getImage();
   const textStyle = style.getText();
+  const hasText = textStyle && textStyle.getText();
   /** @type {import("../render/canvas.js").DeclutterImageWithText} */
-  let declutterImageWithText;
+  const declutterImageWithText =
+    declutter && imageStyle && hasText ? {} : undefined;
   if (imageStyle) {
     if (imageStyle.getImageState() != ImageState.LOADED) {
       return;
     }
-    let imageBuilderGroup = builderGroup;
-    if (declutterBuilderGroup) {
-      const declutterMode = imageStyle.getDeclutterMode();
-      if (declutterMode !== 'none') {
-        imageBuilderGroup = declutterBuilderGroup;
-        if (declutterMode === 'obstacle') {
-          // draw in non-declutter group:
-          const imageReplay = builderGroup.getBuilder(
-            style.getZIndex(),
-            'Image',
-          );
-          imageReplay.setImageStyle(imageStyle, declutterImageWithText);
-          imageReplay.drawPoint(geometry, feature);
-        } else if (textStyle && textStyle.getText()) {
-          declutterImageWithText = {};
-        }
-      }
-    }
-    const imageReplay = imageBuilderGroup.getBuilder(
-      style.getZIndex(),
-      'Image',
-    );
+    const imageReplay = builderGroup.getBuilder(style.getZIndex(), 'Image');
     imageReplay.setImageStyle(imageStyle, declutterImageWithText);
-    imageReplay.drawPoint(geometry, feature);
+    imageReplay.drawPoint(geometry, feature, index);
   }
-  if (textStyle && textStyle.getText()) {
-    let textBuilderGroup = builderGroup;
-    if (declutterBuilderGroup) {
-      textBuilderGroup = declutterBuilderGroup;
-    }
-    const textReplay = textBuilderGroup.getBuilder(style.getZIndex(), 'Text');
+  if (hasText) {
+    const textReplay = builderGroup.getBuilder(style.getZIndex(), 'Text');
     textReplay.setTextStyle(textStyle, declutterImageWithText);
-    textReplay.drawText(geometry, feature);
+    textReplay.drawText(geometry, feature, index);
   }
 }
 
@@ -408,56 +379,36 @@ function renderPointGeometry(
  * @param {import("../geom/MultiPoint.js").default|import("../render/Feature.js").default} geometry Geometry.
  * @param {import("../style/Style.js").default} style Style.
  * @param {import("../Feature.js").FeatureLike} feature Feature.
- * @param {import("../render/canvas/BuilderGroup.js").default} [declutterBuilderGroup] Builder for decluttering.
+ * @param {number} [index] Render order index.
+ * @param {boolean} [declutter] Enable decluttering.
  */
 function renderMultiPointGeometry(
   builderGroup,
   geometry,
   style,
   feature,
-  declutterBuilderGroup,
+  index,
+  declutter,
 ) {
   const imageStyle = style.getImage();
+  const hasImage = imageStyle && imageStyle.getOpacity() !== 0;
   const textStyle = style.getText();
+  const hasText = textStyle && textStyle.getText();
   /** @type {import("../render/canvas.js").DeclutterImageWithText} */
-  let declutterImageWithText;
-  if (imageStyle) {
+  const declutterImageWithText =
+    declutter && hasImage && hasText ? {} : undefined;
+  if (hasImage) {
     if (imageStyle.getImageState() != ImageState.LOADED) {
       return;
     }
-    let imageBuilderGroup = builderGroup;
-    if (declutterBuilderGroup) {
-      const declutterMode = imageStyle.getDeclutterMode();
-      if (declutterMode !== 'none') {
-        imageBuilderGroup = declutterBuilderGroup;
-        if (declutterMode === 'obstacle') {
-          // draw in non-declutter group:
-          const imageReplay = builderGroup.getBuilder(
-            style.getZIndex(),
-            'Image',
-          );
-          imageReplay.setImageStyle(imageStyle, declutterImageWithText);
-          imageReplay.drawMultiPoint(geometry, feature);
-        } else if (textStyle && textStyle.getText()) {
-          declutterImageWithText = {};
-        }
-      }
-    }
-    const imageReplay = imageBuilderGroup.getBuilder(
-      style.getZIndex(),
-      'Image',
-    );
+    const imageReplay = builderGroup.getBuilder(style.getZIndex(), 'Image');
     imageReplay.setImageStyle(imageStyle, declutterImageWithText);
-    imageReplay.drawMultiPoint(geometry, feature);
+    imageReplay.drawMultiPoint(geometry, feature, index);
   }
-  if (textStyle && textStyle.getText()) {
-    let textBuilderGroup = builderGroup;
-    if (declutterBuilderGroup) {
-      textBuilderGroup = declutterBuilderGroup;
-    }
-    const textReplay = textBuilderGroup.getBuilder(style.getZIndex(), 'Text');
+  if (hasText) {
+    const textReplay = builderGroup.getBuilder(style.getZIndex(), 'Text');
     textReplay.setTextStyle(textStyle, declutterImageWithText);
-    textReplay.drawText(geometry, feature);
+    textReplay.drawText(geometry, feature, index);
   }
 }
 
@@ -466,29 +417,20 @@ function renderMultiPointGeometry(
  * @param {import("../geom/Polygon.js").default|import("../render/Feature.js").default} geometry Geometry.
  * @param {import("../style/Style.js").default} style Style.
  * @param {import("../Feature.js").FeatureLike} feature Feature.
- * @param {import("../render/canvas/BuilderGroup.js").default} [declutterBuilderGroup] Builder for decluttering.
+ * @param {number} [index] Render order index.
  */
-function renderPolygonGeometry(
-  builderGroup,
-  geometry,
-  style,
-  feature,
-  declutterBuilderGroup,
-) {
+function renderPolygonGeometry(builderGroup, geometry, style, feature, index) {
   const fillStyle = style.getFill();
   const strokeStyle = style.getStroke();
   if (fillStyle || strokeStyle) {
     const polygonReplay = builderGroup.getBuilder(style.getZIndex(), 'Polygon');
     polygonReplay.setFillStrokeStyle(fillStyle, strokeStyle);
-    polygonReplay.drawPolygon(geometry, feature);
+    polygonReplay.drawPolygon(geometry, feature, index);
   }
   const textStyle = style.getText();
   if (textStyle && textStyle.getText()) {
-    const textReplay = (declutterBuilderGroup || builderGroup).getBuilder(
-      style.getZIndex(),
-      'Text',
-    );
+    const textReplay = builderGroup.getBuilder(style.getZIndex(), 'Text');
     textReplay.setTextStyle(textStyle);
-    textReplay.drawText(geometry, feature);
+    textReplay.drawText(geometry, feature, index);
   }
 }

package/renderer/webgl/PointsLayer.d.ts

@@ -292,6 +292,7 @@ declare class WebGLPointsLayerRenderer extends WebGLLayerRenderer<any> {
      * @param {number} worldWidth the width of the worlds being rendered
      */
     renderWorlds(frameState: import("../../Map.js").FrameState, forHitDetection: boolean, startWorld: number, endWorld: number, worldWidth: number): void;
+    renderDeclutter(): void;
 }
 import WebGLLayerRenderer from './Layer.js';
 import WebGLArrayBuffer from '../../webgl/Buffer.js';

package/renderer/webgl/PointsLayer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PointsLayer.d.ts","sourceRoot":"","sources":["PointsLayer.js"],"names":[],"mappings":";;;;;;;;;UA+Bc,MAAM;;;;;qBACG,OAAO,eAAe,EAAE,OAAO;YAAS,MAAM;UAAM,MAAM;;;;;;;;;;aAOnE,OAAO,eAAe,EAAE,OAAO;;;;;YACxB,MAAM;;;;;cACb,OAAO,YAAY,EAAE,QAAQ;;;;;;;;;;;;;;;;;;kBAW7B,MAAM;;;;oBACN,MAAM;;;;;;;;;;;;;;;;;AAzBpB;;;;;;GAMG;AAEH;;;;;;GAMG;AAEH;;;;;;;;;;;;;;GAcG;AAEH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8DG;AACH;IACE;;;OAGG;IACH,mBAHW,OAAO,sBAAsB,EAAE,OAAO,WACtC,OAAO,EAqNjB;IAzMC,wBAAyB;IAEzB,kCAAuE;IACvE,iCAGC;IAED;;OAEG;IACH,sBAAyC;IAEzC;;OAEG;IACH,wBAA6C;IAE7C;;;OAGG;IACH,iBAAa;IAEb;;;OAGG;IACH,6BAA+D;IAY/D;;;;OAIG;IACH,YAFU,MAAM,OAAO,uBAAuB,EAAE,oBAAoB,CAAC,CAapE;IAgBD,oCAAoE;IAEpE,kDAAoC;IAEpC;;;;;;OAMG;IACH,0BAAkD;IAElD;;;;OAIG;IACH,yBAAyC;IAEzC;;;OAGG;IACH,+BAA+C;IAE/C;;;OAGG;IACH,4BAA8C;IAE9C;;;OAGG;IACH,yBAAqB;IAErB;;;;OAIG;IACH,mBAAmB;IAEnB;;OAEG;IACH,gBAAkC;IAgClC;;;;OAIG;IACH,sBAAuB;IAEvB;;;;OAIG;IACH,sBAAsB;IAGtB,yDAyBC;IAsBH;;;OAGG;IACH,kCAQC;IAED;;;OAGG;IACH,oCAOC;IAED;;;OAGG;IACH,mCAIC;IAED;;OAEG;IACH,kCAGC;IAED;;;;OAIG;IACH,wBAHW,OAAO,cAAc,EAAE,UAAU,GAChC,WAAW,CA4BtB;IA6CD;;;;OAIG;IACH,wBAgFC;IA6CD;;;;;;;OAOG;IACH,yBANW,OAAO,cAAc,EAAE,UAAU,mBACjC,OAAO,cACP,MAAM,YACN,MAAM,cACN,MAAM,QAgChB;CAcF;+BAxoB8B,YAAY;6BADd,uBAAuB"}
+{"version":3,"file":"PointsLayer.d.ts","sourceRoot":"","sources":["PointsLayer.js"],"names":[],"mappings":";;;;;;;;;UA+Bc,MAAM;;;;;qBACG,OAAO,eAAe,EAAE,OAAO;YAAS,MAAM;UAAM,MAAM;;;;;;;;;;aAOnE,OAAO,eAAe,EAAE,OAAO;;;;;YACxB,MAAM;;;;;cACb,OAAO,YAAY,EAAE,QAAQ;;;;;;;;;;;;;;;;;;kBAW7B,MAAM;;;;oBACN,MAAM;;;;;;;;;;;;;;;;;AAzBpB;;;;;;GAMG;AAEH;;;;;;GAMG;AAEH;;;;;;;;;;;;;;GAcG;AAEH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8DG;AACH;IACE;;;OAGG;IACH,mBAHW,OAAO,sBAAsB,EAAE,OAAO,WACtC,OAAO,EAqNjB;IAzMC,wBAAyB;IAEzB,kCAAuE;IACvE,iCAGC;IAED;;OAEG;IACH,sBAAyC;IAEzC;;OAEG;IACH,wBAA6C;IAE7C;;;OAGG;IACH,iBAAa;IAEb;;;OAGG;IACH,6BAA+D;IAY/D;;;;OAIG;IACH,YAFU,MAAM,OAAO,uBAAuB,EAAE,oBAAoB,CAAC,CAapE;IAgBD,oCAAoE;IAEpE,kDAAoC;IAEpC;;;;;;OAMG;IACH,0BAAkD;IAElD;;;;OAIG;IACH,yBAAyC;IAEzC;;;OAGG;IACH,+BAA+C;IAE/C;;;OAGG;IACH,4BAA8C;IAE9C;;;OAGG;IACH,yBAAqB;IAErB;;;;OAIG;IACH,mBAAmB;IAEnB;;OAEG;IACH,gBAAkC;IAgClC;;;;OAIG;IACH,sBAAuB;IAEvB;;;;OAIG;IACH,sBAAsB;IAGtB,yDAyBC;IAsBH;;;OAGG;IACH,kCAQC;IAED;;;OAGG;IACH,oCAOC;IAED;;;OAGG;IACH,mCAIC;IAED;;OAEG;IACH,kCAGC;IAED;;;;OAIG;IACH,wBAHW,OAAO,cAAc,EAAE,UAAU,GAChC,WAAW,CA4BtB;IA6CD;;;;OAIG;IACH,wBAgFC;IA6CD;;;;;;;OAOG;IACH,yBANW,OAAO,cAAc,EAAE,UAAU,mBACjC,OAAO,cACP,MAAM,YACN,MAAM,cACN,MAAM,QAgChB;IAeD,wBAAoB;CACrB;+BA1oB8B,YAAY;6BADd,uBAAuB"}

package/renderer/webgl/PointsLayer.js

@@ -653,6 +653,8 @@ class WebGLPointsLayerRenderer extends WebGLLayerRenderer {
     this.sourceListenKeys_ = null;
     super.disposeInternal();
   }
+
+  renderDeclutter() {}
 }
 
 export default WebGLPointsLayerRenderer;

package/source/Raster.js

@@ -630,7 +630,7 @@ class RasterSource extends ImageSource {
     this.frameState_ = {
       animate: false,
       coordinateToPixelTransform: createTransform(),
-      declutterTree: null,
+      declutter: null,
       extent: null,
       index: 0,
       layerIndex: 0,

package/source/WMTS.js

@@ -361,7 +361,7 @@ export default WMTS;
  */
 export function optionsFromCapabilities(wmtsCap, config) {
   const layers = wmtsCap['Contents']['Layer'];
-  const l = layers.find(function (elt) {
+  const l = layers?.find(function (elt) {
     return elt['Identifier'] == config['layer'];
   });
   if (!l) {

package/style/Circle.d.ts

@@ -34,7 +34,7 @@ export type Options = {
     /**
      * Declutter mode
      */
-    declutterMode?: "declutter" | "obstacle" | "none" | undefined;
+    declutterMode?: import("./Style.js").DeclutterMode | undefined;
 };
 /**
  * @typedef {Object} Options
@@ -48,7 +48,7 @@ export type Options = {
  * (positive rotation clockwise, meaningful only when used in conjunction with a two dimensional scale).
  * @property {boolean} [rotateWithView=false] Whether to rotate the shape with the view
  * (meaningful only when used in conjunction with a two dimensional scale).
- * @property {"declutter"|"obstacle"|"none"|undefined} [declutterMode] Declutter mode
+ * @property {import('./Style.js').DeclutterMode} [declutterMode] Declutter mode
  */
 /**
  * @classdesc

package/style/Circle.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Circle.d.ts","sourceRoot":"","sources":["Circle.js"],"names":[],"mappings":";;;;;;;;;YASc,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;oBASN,WAAW,GAAC,UAAU,GAAC,MAAM,GAAC,SAAS;;AAZrD;;;;;;;;;;;;;GAaG;AAEH;;;;GAIG;AACH;IACE;;OAEG;IACH,2CAgBC;IAED;;;;OAIG;IACH,SAHY,WAAW,CAiBtB;IAED;;;;;OAKG;IACH,kBAHW,MAAM,QAMhB;CACF;yBA3EwB,mBAAmB"}
+{"version":3,"file":"Circle.d.ts","sourceRoot":"","sources":["Circle.js"],"names":[],"mappings":";;;;;;;;;YASc,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAHpB;;;;;;;;;;;;;GAaG;AAEH;;;;GAIG;AACH;IACE;;OAEG;IACH,2CAgBC;IAED;;;;OAIG;IACH,SAHY,WAAW,CAiBtB;IAED;;;;;OAKG;IACH,kBAHW,MAAM,QAMhB;CACF;yBA3EwB,mBAAmB"}

package/style/Circle.js

@@ -16,7 +16,7 @@ import RegularShape from './RegularShape.js';
  * (positive rotation clockwise, meaningful only when used in conjunction with a two dimensional scale).
  * @property {boolean} [rotateWithView=false] Whether to rotate the shape with the view
  * (meaningful only when used in conjunction with a two dimensional scale).
- * @property {"declutter"|"obstacle"|"none"|undefined} [declutterMode] Declutter mode
+ * @property {import('./Style.js').DeclutterMode} [declutterMode] Declutter mode
  */
 
 /**

package/style/Icon.d.ts

@@ -95,7 +95,7 @@ export type Options = {
     /**
      * Declutter mode.
      */
-    declutterMode?: "declutter" | "obstacle" | "none" | undefined;
+    declutterMode?: import("./Style.js").DeclutterMode | undefined;
 };
 /**
  * @classdesc

package/style/Icon.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Icon.d.ts","sourceRoot":"","sources":["Icon.js"],"names":[],"mappings":";;;;8BAYa,UAAU,GAAG,QAAQ;;;;yBAKrB,aAAa,GAAG,cAAc,GAAG,UAAU,GAAG,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;oBAoCxD,WAAW,GAAC,UAAU,GAAC,MAAM,GAAC,SAAS;;AAuBrD;;;;GAIG;AACH;IACE;;OAEG;IACH,2CAmMC;IAjKC;;;OAGG;IACH,gBAAyE;IAEzE;;;OAGG;IACH,0BAA6B;IAE7B;;;OAGG;IACH,sBACwE;IAExE;;;OAGG;IACH,sBACwE;IAExE;;;OAGG;IACH,sBACwE;IAExE;;;OAGG;IACH,qBACgE;IA0ChE;;;OAGG;IACH,eAAyE;IAEzE;;;OAGG;IACH,mBAMC;IAED;;;OAGG;IACH,gBAAqE;IACrE;;;OAGG;IACH,sBACwE;IAExE;;;OAGG;IACH,gBAAmB;IAEnB;;;OAGG;IACH,cAA6D;IAevD,qCAA8B;IA4BtC;;;;OAIG;IACH,SAHY,IAAI,CAmCf;IA6DD;;;;;;OAMG;IACH,kBAHW,MAAM,MAAM,CAAC,QAMvB;IAED;;;;OAIG;IACH,YAHY,OAAO,aAAa,EAAE,KAAK,CAKtC;IAED;;;;;;OAMG;IACH,qBALW,MAAM,GACL,gBAAgB,GAAC,iBAAiB,GAAC,WAAW,CAMzD;IA0BD;;OAEG;IACH,wBAFY,gBAAgB,GAAC,iBAAiB,GAAC,WAAW,CAIzD;IAqCD;;;;OAIG;IACH,UAHY,MAAM,GAAC,SAAS,CAK3B;IAWD;;;;OAIG;IACH,YAHY,MAAM,CAYjB;IAED;;;;OAIG;IACH,aAHY,MAAM,CAYjB;CAyCF;uBAljBsB,YAAY"}
+{"version":3,"file":"Icon.d.ts","sourceRoot":"","sources":["Icon.js"],"names":[],"mappings":";;;;8BAYa,UAAU,GAAG,QAAQ;;;;yBAKrB,aAAa,GAAG,cAAc,GAAG,UAAU,GAAG,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA2DtE;;;;GAIG;AACH;IACE;;OAEG;IACH,2CAmMC;IAjKC;;;OAGG;IACH,gBAAyE;IAEzE;;;OAGG;IACH,0BAA6B;IAE7B;;;OAGG;IACH,sBACwE;IAExE;;;OAGG;IACH,sBACwE;IAExE;;;OAGG;IACH,sBACwE;IAExE;;;OAGG;IACH,qBACgE;IA0ChE;;;OAGG;IACH,eAAyE;IAEzE;;;OAGG;IACH,mBAMC;IAED;;;OAGG;IACH,gBAAqE;IACrE;;;OAGG;IACH,sBACwE;IAExE;;;OAGG;IACH,gBAAmB;IAEnB;;;OAGG;IACH,cAA6D;IAevD,qCAA8B;IA4BtC;;;;OAIG;IACH,SAHY,IAAI,CAmCf;IA6DD;;;;;;OAMG;IACH,kBAHW,MAAM,MAAM,CAAC,QAMvB;IAED;;;;OAIG;IACH,YAHY,OAAO,aAAa,EAAE,KAAK,CAKtC;IAED;;;;;;OAMG;IACH,qBALW,MAAM,GACL,gBAAgB,GAAC,iBAAiB,GAAC,WAAW,CAMzD;IA0BD;;OAEG;IACH,wBAFY,gBAAgB,GAAC,iBAAiB,GAAC,WAAW,CAIzD;IAqCD;;;;OAIG;IACH,UAHY,MAAM,GAAC,SAAS,CAK3B;IAWD;;;;OAIG;IACH,YAHY,MAAM,CAYjB;IAED;;;;OAIG;IACH,aAHY,MAAM,CAYjB;CAyCF;uBAljBsB,YAAY"}

package/style/Icon.js

@@ -51,7 +51,7 @@ import {getUid} from '../util.js';
  * @property {import("../size.js").Size} [size] Icon size in pixels. Used together with `offset` to define the
  * sub-rectangle to use from the original (sprite) image.
  * @property {string} [src] Image source URI.
- * @property {"declutter"|"obstacle"|"none"|undefined} [declutterMode] Declutter mode.
+ * @property {import("./Style.js").DeclutterMode} [declutterMode] Declutter mode.
  */
 
 /**

package/style/Image.d.ts

@@ -21,9 +21,9 @@ export type Options = {
      */
     displacement: Array<number>;
     /**
-     * Declutter mode: `declutter`, `obstacle`, 'none
+     * Declutter mode: `declutter`, `obstacle`, `none`.
      */
-    declutterMode: "declutter" | "obstacle" | "none" | undefined;
+    declutterMode: import('../style/Style.js').DeclutterMode;
 };
 /**
  * @typedef {Object} Options
@@ -32,7 +32,8 @@ export type Options = {
  * @property {number} rotation Rotation.
  * @property {number|import("../size.js").Size} scale Scale.
  * @property {Array<number>} displacement Displacement.
- * @property {"declutter"|"obstacle"|"none"|undefined} declutterMode Declutter mode: `declutter`, `obstacle`, 'none */
+ * @property {import('../style/Style.js').DeclutterMode} declutterMode Declutter mode: `declutter`, `obstacle`, `none`.
+ */
 /**
  * @classdesc
  * A base class used for creating subclasses and not instantiated in
@@ -78,7 +79,7 @@ declare class ImageStyle {
     private displacement_;
     /**
      * @private
-     * @type {"declutter"|"obstacle"|"none"|undefined}
+     * @type {import('../style/Style.js').DeclutterMode}
      */
     private declutterMode_;
     /**
@@ -124,10 +125,10 @@ declare class ImageStyle {
     getDisplacement(): Array<number>;
     /**
      * Get the declutter mode of the shape
-     * @return {"declutter"|"obstacle"|"none"|undefined} Shape's declutter mode
+     * @return {import("./Style.js").DeclutterMode} Shape's declutter mode
      * @api
      */
-    getDeclutterMode(): "declutter" | "obstacle" | "none" | undefined;
+    getDeclutterMode(): import("./Style.js").DeclutterMode;
     /**
      * Get the anchor point in pixels. The anchor determines the center point for the
      * symbolizer.

package/style/Image.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Image.d.ts","sourceRoot":"","sources":["Image.js"],"names":[],"mappings":";;;;;aAQc,MAAM;;;;oBACN,OAAO;;;;cACP,MAAM;;;;WACN,MAAM,GAAC,OAAO,YAAY,EAAE,IAAI;;;;kBAChC,MAAM,MAAM,CAAC;;;;mBACb,WAAW,GAAC,UAAU,GAAC,MAAM,GAAC,SAAS;;AAPrD;;;;;;;sHAOsH;AAEtH;;;;;;;GAOG;AACH;IACE;;OAEG;IACH,qBAFW,OAAO,EA4CjB;IAzCC;;;OAGG;IACH,iBAA+B;IAE/B;;;OAGG;IACH,wBAA6C;IAE7C;;;OAGG;IACH,kBAAiC;IAEjC;;;OAGG;IACH,eAA2B;IAE3B;;;OAGG;IACH,oBAAwC;IAExC;;;OAGG;IACH,sBAAyC;IAEzC;;;OAGG;IACH,uBAA2C;IAG7C;;;;OAIG;IACH,SAHY,UAAU,CAarB;IAED;;;;OAIG;IACH,cAHY,MAAM,CAKjB;IAED;;;;OAIG;IACH,qBAHY,OAAO,CAKlB;IAED;;;;OAIG;IACH,eAHY,MAAM,CAKjB;IAED;;;;OAIG;IACH,YAHY,MAAM,GAAC,OAAO,YAAY,EAAE,IAAI,CAK3C;IAED;;;OAGG;IACH,iBAFY,OAAO,YAAY,EAAE,IAAI,CAIpC;IAED;;;;OAIG;IACH,mBAHY,MAAM,MAAM,CAAC,CAKxB;IAED;;;;OAIG;IACH,oBAHY,WAAW,GAAC,UAAU,GAAC,MAAM,GAAC,SAAS,CAKlD;IAED;;;;;OAKG;IACH,aAFY,MAAM,MAAM,CAAC,CAIxB;IAED;;;;;OAKG;IACH,qBAHW,MAAM,GACL,OAAO,gBAAgB,EAAE,SAAS,CAI7C;IAED;;;OAGG;IACH,wBAFY,OAAO,gBAAgB,EAAE,SAAS,CAI7C;IAED;;;;OAIG;IACH,0BAHW,MAAM,GACL,MAAM,CAIjB;IAED;;;OAGG;IACH,qBAEC;IAED;;;OAGG;IACH,gBAFY,OAAO,YAAY,EAAE,IAAI,CAIpC;IAED;;;;OAIG;IACH,aAFY,MAAM,MAAM,CAAC,CAIxB;IAED;;;;OAIG;IACH,WAFY,OAAO,YAAY,EAAE,IAAI,CAIpC;IAED;;;;;OAKG;IACH,8BAHW,MAAM,MAAM,CAAC,QAKvB;IAED;;;;;OAKG;IACH,oBAHW,MAAM,QAKhB;IAED;;;;;OAKG;IACH,kCAHW,OAAO,QAKjB;IAED;;;;;OAKG;IACH,sBAHW,MAAM,QAKhB;IAED;;;;;OAKG;IACH,gBAHW,MAAM,GAAC,OAAO,YAAY,EAAE,IAAI,QAM1C;IAED;;;OAGG;IACH,mCAFoB,OAAO,oBAAoB,EAAE,OAAO,KAAG,IAAI,QAI9D;IAED;;;OAGG;IACH,aAEC;IAED;;;OAGG;IACH,qCAFoB,OAAO,oBAAoB,EAAE,OAAO,KAAG,IAAI,QAI9D;IAED;;OAEG;IACH,SAFY,QAAQ,IAAI,CAAC,CAIxB;CACF"}
+{"version":3,"file":"Image.d.ts","sourceRoot":"","sources":["Image.js"],"names":[],"mappings":";;;;;aAQc,MAAM;;;;oBACN,OAAO;;;;cACP,MAAM;;;;WACN,MAAM,GAAC,OAAO,YAAY,EAAE,IAAI;;;;kBAChC,MAAM,MAAM,CAAC;;;;mBACb,OAAO,mBAAmB,EAAE,aAAa;;AAPvD;;;;;;;;GAQG;AAEH;;;;;;;GAOG;AACH;IACE;;OAEG;IACH,qBAFW,OAAO,EA4CjB;IAzCC;;;OAGG;IACH,iBAA+B;IAE/B;;;OAGG;IACH,wBAA6C;IAE7C;;;OAGG;IACH,kBAAiC;IAEjC;;;OAGG;IACH,eAA2B;IAE3B;;;OAGG;IACH,oBAAwC;IAExC;;;OAGG;IACH,sBAAyC;IAEzC;;;OAGG;IACH,uBAA2C;IAG7C;;;;OAIG;IACH,SAHY,UAAU,CAarB;IAED;;;;OAIG;IACH,cAHY,MAAM,CAKjB;IAED;;;;OAIG;IACH,qBAHY,OAAO,CAKlB;IAED;;;;OAIG;IACH,eAHY,MAAM,CAKjB;IAED;;;;OAIG;IACH,YAHY,MAAM,GAAC,OAAO,YAAY,EAAE,IAAI,CAK3C;IAED;;;OAGG;IACH,iBAFY,OAAO,YAAY,EAAE,IAAI,CAIpC;IAED;;;;OAIG;IACH,mBAHY,MAAM,MAAM,CAAC,CAKxB;IAED;;;;OAIG;IACH,oBAHY,OAAO,YAAY,EAAE,aAAa,CAK7C;IAED;;;;;OAKG;IACH,aAFY,MAAM,MAAM,CAAC,CAIxB;IAED;;;;;OAKG;IACH,qBAHW,MAAM,GACL,OAAO,gBAAgB,EAAE,SAAS,CAI7C;IAED;;;OAGG;IACH,wBAFY,OAAO,gBAAgB,EAAE,SAAS,CAI7C;IAED;;;;OAIG;IACH,0BAHW,MAAM,GACL,MAAM,CAIjB;IAED;;;OAGG;IACH,qBAEC;IAED;;;OAGG;IACH,gBAFY,OAAO,YAAY,EAAE,IAAI,CAIpC;IAED;;;;OAIG;IACH,aAFY,MAAM,MAAM,CAAC,CAIxB;IAED;;;;OAIG;IACH,WAFY,OAAO,YAAY,EAAE,IAAI,CAIpC;IAED;;;;;OAKG;IACH,8BAHW,MAAM,MAAM,CAAC,QAKvB;IAED;;;;;OAKG;IACH,oBAHW,MAAM,QAKhB;IAED;;;;;OAKG;IACH,kCAHW,OAAO,QAKjB;IAED;;;;;OAKG;IACH,sBAHW,MAAM,QAKhB;IAED;;;;;OAKG;IACH,gBAHW,MAAM,GAAC,OAAO,YAAY,EAAE,IAAI,QAM1C;IAED;;;OAGG;IACH,mCAFoB,OAAO,oBAAoB,EAAE,OAAO,KAAG,IAAI,QAI9D;IAED;;;OAGG;IACH,aAEC;IAED;;;OAGG;IACH,qCAFoB,OAAO,oBAAoB,EAAE,OAAO,KAAG,IAAI,QAI9D;IAED;;OAEG;IACH,SAFY,QAAQ,IAAI,CAAC,CAIxB;CACF"}

package/style/Image.js

@@ -11,7 +11,8 @@ import {toSize} from '../size.js';
  * @property {number} rotation Rotation.
  * @property {number|import("../size.js").Size} scale Scale.
  * @property {Array<number>} displacement Displacement.
- * @property {"declutter"|"obstacle"|"none"|undefined} declutterMode Declutter mode: `declutter`, `obstacle`, 'none */
+ * @property {import('../style/Style.js').DeclutterMode} declutterMode Declutter mode: `declutter`, `obstacle`, `none`.
+ */
 
 /**
  * @classdesc
@@ -64,7 +65,7 @@ class ImageStyle {
 
     /**
      * @private
-     * @type {"declutter"|"obstacle"|"none"|undefined}
+     * @type {import('../style/Style.js').DeclutterMode}
      */
     this.declutterMode_ = options.declutterMode;
   }
@@ -141,7 +142,7 @@ class ImageStyle {
 
   /**
    * Get the declutter mode of the shape
-   * @return {"declutter"|"obstacle"|"none"|undefined} Shape's declutter mode
+   * @return {import("./Style.js").DeclutterMode} Shape's declutter mode
    * @api
    */
   getDeclutterMode() {

package/style/RegularShape.d.ts

@@ -49,7 +49,7 @@ export type Options = {
     /**
      * Declutter mode.
      */
-    declutterMode?: "declutter" | "obstacle" | "none" | undefined;
+    declutterMode?: import("./Style.js").DeclutterMode | undefined;
 };
 export type RenderOptions = {
     /**
@@ -101,7 +101,7 @@ export type RenderOptions = {
  * @property {boolean} [rotateWithView=false] Whether to rotate the shape with the view.
  * @property {number|import("../size.js").Size} [scale=1] Scale. Unless two dimensional scaling is required a better
  * result may be obtained with appropriate settings for `radius` and `radius2`.
- * @property {"declutter"|"obstacle"|"none"|undefined} [declutterMode] Declutter mode.
+ * @property {import('./Style.js').DeclutterMode} [declutterMode] Declutter mode.
  */
 /**
  * @typedef {Object} RenderOptions

package/style/RegularShape.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RegularShape.d.ts","sourceRoot":"","sources":["RegularShape.js"],"names":[],"mappings":";;;;;;;;;;;;;YAsBc,MAAM;;;;YAEN,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;oBAUN,WAAW,GAAC,UAAU,GAAC,MAAM,GAAC,SAAS;;;;;;iBAKvC,OAAO,iBAAiB,EAAE,SAAS,GAAC,SAAS;;;;iBAC7C,MAAM;;;;UACN,MAAM;;;;aACN,aAAa;;;;cACb,MAAM,MAAM,CAAC,GAAC,IAAI;;;;oBAClB,MAAM;;;;cACN,cAAc;;;;gBACd,MAAM;;AA5BpB;;;;;;;;;;;;;;;;;GAiBG;AAEH;;;;;;;;;;GAUG;AAEH;;;;;;GAMG;AACH;IACE;;OAEG;IACH,qBAFW,OAAO,EAwFjB;IA1EC;;;OAGG;IACH,kBAAc;IAEd;;;OAGG;IACH,4BAA+B;IAE/B;;;OAGG;IACH,cAA6D;IAE7D;;;OAGG;IACH,gBAAqB;IAErB;;;OAGG;IACH,gBAA6B;IAE7B;;;OAGG;IACH,mBAFU,MAAM,CAEa;IAE7B;;;OAGG;IACH,iBAA+B;IAE/B;;;OAGG;IACH,eAA6D;IAE7D;;;OAGG;IACH,gBAAmE;IAEnE;;;OAGG;IACH,cAAU;IAEV;;;OAGG;IACH,uBAAmB;IAEnB,oBAGuB;IAOzB;;;;OAIG;IACH,SAHY,YAAY,CAoBvB;IAoBD;;;;OAIG;IACH,YAHY,MAAM,CAKjB;IAED;;;;OAIG;IACH,WAHY,OAAO,WAAW,EAAE,OAAO,GAAC,IAAI,CAK3C;IAED;;;;OAIG;IACH,cAHW,OAAO,WAAW,EAAE,OAAO,GAAC,IAAI,QAM1C;IAED;;OAEG;IACH,wBAFY,iBAAiB,CAS5B;IAED;;;;;OAKG;IACH,qBAJW,MAAM,GACL,iBAAiB,CAiB5B;IAkCD;;;;OAIG;IACH,aAHY,MAAM,CAKjB;IAED;;;;OAIG;IACH,aAHY,MAAM,CAKjB;IAED;;;;OAIG;IACH,cAHY,MAAM,GAAC,SAAS,CAK3B;IAWD;;;;OAIG;IACH,aAHY,OAAO,aAAa,EAAE,OAAO,GAAC,IAAI,CAK7C;IAED;;;;OAIG;IACH,kBAHW,OAAO,aAAa,EAAE,OAAO,GAAC,IAAI,QAM5C;IAiBD;;;;;;;OAOG;IACH,+BAgFC;IAED;;;OAGG;IACH,iCAHY,aAAa,CAoCxB;IAED;;OAEG;IACH,yBAMC;IAED;;;;;OAKG;IACH,cA2BC;IAED;;;;OAIG;IACH,kCAuBC;IAED;;;OAGG;IACH,oBAmBC;IAED;;;;OAIG;IACH,gCAmBC;CAKF;uBAhmBsB,YAAY"}
+{"version":3,"file":"RegularShape.d.ts","sourceRoot":"","sources":["RegularShape.js"],"names":[],"mappings":";;;;;;;;;;;;;YAsBc,MAAM;;;;YAEN,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAeN,OAAO,iBAAiB,EAAE,SAAS,GAAC,SAAS;;;;iBAC7C,MAAM;;;;UACN,MAAM;;;;aACN,aAAa;;;;cACb,MAAM,MAAM,CAAC,GAAC,IAAI;;;;oBAClB,MAAM;;;;cACN,cAAc;;;;gBACd,MAAM;;AA5BpB;;;;;;;;;;;;;;;;;GAiBG;AAEH;;;;;;;;;;GAUG;AAEH;;;;;;GAMG;AACH;IACE;;OAEG;IACH,qBAFW,OAAO,EAwFjB;IA1EC;;;OAGG;IACH,kBAAc;IAEd;;;OAGG;IACH,4BAA+B;IAE/B;;;OAGG;IACH,cAA6D;IAE7D;;;OAGG;IACH,gBAAqB;IAErB;;;OAGG;IACH,gBAA6B;IAE7B;;;OAGG;IACH,mBAFU,MAAM,CAEa;IAE7B;;;OAGG;IACH,iBAA+B;IAE/B;;;OAGG;IACH,eAA6D;IAE7D;;;OAGG;IACH,gBAAmE;IAEnE;;;OAGG;IACH,cAAU;IAEV;;;OAGG;IACH,uBAAmB;IAEnB,oBAGuB;IAOzB;;;;OAIG;IACH,SAHY,YAAY,CAoBvB;IAoBD;;;;OAIG;IACH,YAHY,MAAM,CAKjB;IAED;;;;OAIG;IACH,WAHY,OAAO,WAAW,EAAE,OAAO,GAAC,IAAI,CAK3C;IAED;;;;OAIG;IACH,cAHW,OAAO,WAAW,EAAE,OAAO,GAAC,IAAI,QAM1C;IAED;;OAEG;IACH,wBAFY,iBAAiB,CAS5B;IAED;;;;;OAKG;IACH,qBAJW,MAAM,GACL,iBAAiB,CAiB5B;IAkCD;;;;OAIG;IACH,aAHY,MAAM,CAKjB;IAED;;;;OAIG;IACH,aAHY,MAAM,CAKjB;IAED;;;;OAIG;IACH,cAHY,MAAM,GAAC,SAAS,CAK3B;IAWD;;;;OAIG;IACH,aAHY,OAAO,aAAa,EAAE,OAAO,GAAC,IAAI,CAK7C;IAED;;;;OAIG;IACH,kBAHW,OAAO,aAAa,EAAE,OAAO,GAAC,IAAI,QAM5C;IAiBD;;;;;;;OAOG;IACH,+BAgFC;IAED;;;OAGG;IACH,iCAHY,aAAa,CAoCxB;IAED;;OAEG;IACH,yBAMC;IAED;;;;;OAKG;IACH,cA2BC;IAED;;;;OAIG;IACH,kCAuBC;IAED;;;OAGG;IACH,oBAmBC;IAED;;;;OAIG;IACH,gCAmBC;CAKF;uBAhmBsB,YAAY"}