maplibre-gl 2.0.4 → 2.1.2

package/src/style/style_image.ts

@@ -3,18 +3,18 @@ import {RGBAImage} from '../util/image';
 import type Map from '../ui/map';
 
 export type StyleImageData = {
-  data: RGBAImage;
-  version: number;
-  hasRenderCallback?: boolean;
-  userImage?: StyleImageInterface;
+    data: RGBAImage;
+    version: number;
+    hasRenderCallback?: boolean;
+    userImage?: StyleImageInterface;
 };
 
 export type StyleImageMetadata = {
-  pixelRatio: number;
-  sdf: boolean;
-  stretchX?: Array<[number, number]>;
-  stretchY?: Array<[number, number]>;
-  content?: [number, number, number, number];
+    pixelRatio: number;
+    sdf: boolean;
+    stretchX?: Array<[number, number]>;
+    stretchY?: Array<[number, number]>;
+    content?: [number, number, number, number];
 };
 
 export type StyleImage = StyleImageData & StyleImageMetadata;
@@ -73,55 +73,55 @@ export type StyleImage = StyleImageData & StyleImageMetadata;
  */
 
 export interface StyleImageInterface {
-  /**
-   * @property {number} width
-   */
-  width: number;
-  /**
-  * @property {number} height
-  */
-  height: number;
-  /**
-   * @property {Uint8Array | Uint8ClampedArray} data
-  */
-  data: Uint8Array | Uint8ClampedArray;
-  /**
-   * This method is called once before every frame where the icon will be used.
-   * The method can optionally update the image's `data` member with a new image.
-   *
-   * If the method updates the image it must return `true` to commit the change.
-   * If the method returns `false` or nothing the image is assumed to not have changed.
-   *
-   * If updates are infrequent it maybe easier to use {@link Map#updateImage} to update
-   * the image instead of implementing this method.
-   *
-   * @function
-   * @memberof StyleImageInterface
-   * @instance
-   * @name render
-   * @return {boolean} `true` if this method updated the image. `false` if the image was not changed.
-   */
-  render?: () => boolean;
-  /**
-   * Optional method called when the layer has been added to the Map with {@link Map#addImage}.
-   *
-   * @function
-   * @memberof StyleImageInterface
-   * @instance
-   * @name onAdd
-   * @param {Map} map The Map this custom layer was just added to.
-   */
-  onAdd?: (map: Map, id: string) => void;
-  /**
-   * Optional method called when the icon is removed from the map with {@link Map#removeImage}.
-   * This gives the image a chance to clean up resources and event listeners.
-   *
-   * @function
-   * @memberof StyleImageInterface
-   * @instance
-   * @name onRemove
-   */
-  onRemove?: () => void;
+    /**
+     * @property {number} width
+     */
+    width: number;
+    /**
+     * @property {number} height
+     */
+    height: number;
+    /**
+     * @property {Uint8Array | Uint8ClampedArray} data
+     */
+    data: Uint8Array | Uint8ClampedArray;
+    /**
+     * This method is called once before every frame where the icon will be used.
+     * The method can optionally update the image's `data` member with a new image.
+     *
+     * If the method updates the image it must return `true` to commit the change.
+     * If the method returns `false` or nothing the image is assumed to not have changed.
+     *
+     * If updates are infrequent it maybe easier to use {@link Map#updateImage} to update
+     * the image instead of implementing this method.
+     *
+     * @function
+     * @memberof StyleImageInterface
+     * @instance
+     * @name render
+     * @return {boolean} `true` if this method updated the image. `false` if the image was not changed.
+     */
+    render?: () => boolean;
+    /**
+     * Optional method called when the layer has been added to the Map with {@link Map#addImage}.
+     *
+     * @function
+     * @memberof StyleImageInterface
+     * @instance
+     * @name onAdd
+     * @param {Map} map The Map this custom layer was just added to.
+     */
+    onAdd?: (map: Map, id: string) => void;
+    /**
+     * Optional method called when the icon is removed from the map with {@link Map#removeImage}.
+     * This gives the image a chance to clean up resources and event listeners.
+     *
+     * @function
+     * @memberof StyleImageInterface
+     * @instance
+     * @name onRemove
+     */
+    onRemove?: () => void;
 }
 
 export function renderStyleImage(image: StyleImage) {

package/src/style/style_layer/background_style_layer.ts

@@ -1,9 +1,9 @@
 import StyleLayer from '../style_layer';
 
-import properties, {BackgroundPaintPropsPossiblyEvaluated} from './background_style_layer_properties';
+import properties, {BackgroundPaintPropsPossiblyEvaluated} from './background_style_layer_properties.g';
 import {Transitionable, Transitioning, PossiblyEvaluated} from '../properties';
 
-import type {BackgroundPaintProps} from './background_style_layer_properties';
+import type {BackgroundPaintProps} from './background_style_layer_properties.g';
 import type {LayerSpecification} from '../../style-spec/types';
 
 class BackgroundStyleLayer extends StyleLayer {

package/src/style/style_layer/circle_style_layer.ts

@@ -3,14 +3,14 @@ import StyleLayer from '../style_layer';
 import CircleBucket from '../../data/bucket/circle_bucket';
 import {polygonIntersectsBufferedPoint} from '../../util/intersection_tests';
 import {getMaximumPaintValue, translateDistance, translate} from '../query_utils';
-import properties, {CircleLayoutPropsPossiblyEvaluated, CirclePaintPropsPossiblyEvaluated} from './circle_style_layer_properties';
+import properties, {CircleLayoutPropsPossiblyEvaluated, CirclePaintPropsPossiblyEvaluated} from './circle_style_layer_properties.g';
 import {Transitionable, Transitioning, Layout, PossiblyEvaluated} from '../properties';
 import {mat4, vec4} from 'gl-matrix';
 import Point from '@mapbox/point-geometry';
 import type {FeatureState} from '../../style-spec/expression';
 import type Transform from '../../geo/transform';
 import type {Bucket, BucketParameters} from '../../data/bucket';
-import type {CircleLayoutProps, CirclePaintProps} from './circle_style_layer_properties';
+import type {CircleLayoutProps, CirclePaintProps} from './circle_style_layer_properties.g';
 import type {LayerSpecification} from '../../style-spec/types';
 import type {VectorTileFeature} from '@mapbox/vector-tile';
 
@@ -38,14 +38,14 @@ class CircleStyleLayer extends StyleLayer {
     }
 
     queryIntersectsFeature(
-      queryGeometry: Array<Point>,
-      feature: VectorTileFeature,
-      featureState: FeatureState,
-      geometry: Array<Array<Point>>,
-      zoom: number,
-      transform: Transform,
-      pixelsToTileUnits: number,
-      pixelPosMatrix: mat4
+        queryGeometry: Array<Point>,
+        feature: VectorTileFeature,
+        featureState: FeatureState,
+        geometry: Array<Array<Point>>,
+        zoom: number,
+        transform: Transform,
+        pixelsToTileUnits: number,
+        pixelPosMatrix: mat4
     ): boolean {
         const translatedPolygon = translate(queryGeometry,
             this.paint.get('circle-translate'),

package/src/style/style_layer/custom_style_layer.ts

@@ -75,15 +75,15 @@ export interface CustomLayerInterface {
     /**
      * @property {string} id A unique layer id.
      */
-  id: string;
+    id: string;
     /**
      * @property {string} type The layer's type. Must be `"custom"`.
      */
-  type: 'custom';
+    type: 'custom';
     /**
      * @property {string} renderingMode Either `"2d"` or `"3d"`. Defaults to `"2d"`.
      */
-  renderingMode: '2d' | '3d';
+    renderingMode: '2d' | '3d';
     /**
      * Called during a render frame allowing the layer to draw into the GL context.
      *
@@ -112,7 +112,7 @@ export interface CustomLayerInterface {
      * lengths in mercator units would be rendered as a cube. {@link MercatorCoordinate}.fromLngLat
      * can be used to project a `LngLat` to a mercator coordinate.
      */
-  render: CustomRenderMethod;
+    render: CustomRenderMethod;
     /**
      * Optional method called during a render frame to allow a layer to prepare resources or render into a texture.
      *
@@ -130,7 +130,7 @@ export interface CustomLayerInterface {
      * lengths in mercator units would be rendered as a cube. {@link MercatorCoordinate}.fromLngLat
      * can be used to project a `LngLat` to a mercator coordinate.
      */
-  prerender: CustomRenderMethod;
+    prerender: CustomRenderMethod;
     /**
      * Optional method called when the layer has been added to the Map with {@link Map#addLayer}. This
      * gives the layer a chance to initialize gl resources and register event listeners.
@@ -142,19 +142,19 @@ export interface CustomLayerInterface {
      * @param {Map} map The Map this custom layer was just added to.
      * @param {WebGLRenderingContext} gl The gl context for the map.
      */
-  onAdd(map: Map, gl: WebGLRenderingContext): void;
+    onAdd(map: Map, gl: WebGLRenderingContext): void;
     /**
-    * Optional method called when the layer has been removed from the Map with {@link Map#removeLayer}. This
-    * gives the layer a chance to clean up gl resources and event listeners.
-    *
-    * @function
-    * @memberof CustomLayerInterface
-    * @instance
-    * @name onRemove
-    * @param {Map} map The Map this custom layer was just added to.
-    * @param {WebGLRenderingContext} gl The gl context for the map.
-    */
-  onRemove(map: Map, gl: WebGLRenderingContext): void;
+     * Optional method called when the layer has been removed from the Map with {@link Map#removeLayer}. This
+     * gives the layer a chance to clean up gl resources and event listeners.
+     *
+     * @function
+     * @memberof CustomLayerInterface
+     * @instance
+     * @name onRemove
+     * @param {Map} map The Map this custom layer was just added to.
+     * @param {WebGLRenderingContext} gl The gl context for the map.
+     */
+    onRemove(map: Map, gl: WebGLRenderingContext): void;
 }
 
 export function validateCustomStyleLayer(layerObject: CustomLayerInterface) {
@@ -213,13 +213,13 @@ class CustomStyleLayer extends StyleLayer {
         if (this.implementation.onAdd) {
             this.implementation.onAdd(map, map.painter.context.gl);
         }
-    }
+    };
 
     onRemove = (map: Map) => {
         if (this.implementation.onRemove) {
             this.implementation.onRemove(map, map.painter.context.gl);
         }
-    }
+    };
 }
 
 export default CustomStyleLayer;

package/src/style/style_layer/fill_extrusion_style_layer.ts

@@ -3,19 +3,19 @@ import StyleLayer from '../style_layer';
 import FillExtrusionBucket from '../../data/bucket/fill_extrusion_bucket';
 import {polygonIntersectsPolygon, polygonIntersectsMultiPolygon} from '../../util/intersection_tests';
 import {translateDistance, translate} from '../query_utils';
-import properties, {FillExtrusionPaintPropsPossiblyEvaluated} from './fill_extrusion_style_layer_properties';
+import properties, {FillExtrusionPaintPropsPossiblyEvaluated} from './fill_extrusion_style_layer_properties.g';
 import {Transitionable, Transitioning, PossiblyEvaluated} from '../properties';
 import {mat4, vec4} from 'gl-matrix';
 import Point from '@mapbox/point-geometry';
 import type {FeatureState} from '../../style-spec/expression';
 import type {BucketParameters} from '../../data/bucket';
-import type {FillExtrusionPaintProps} from './fill_extrusion_style_layer_properties';
+import type {FillExtrusionPaintProps} from './fill_extrusion_style_layer_properties.g';
 import type Transform from '../../geo/transform';
 import type {LayerSpecification} from '../../style-spec/types';
 import type {VectorTileFeature} from '@mapbox/vector-tile';
 
 export class Point3D extends Point {
-    z: number
+    z: number;
 }
 
 class FillExtrusionStyleLayer extends StyleLayer {
@@ -40,14 +40,14 @@ class FillExtrusionStyleLayer extends StyleLayer {
     }
 
     queryIntersectsFeature(
-      queryGeometry: Array<Point>,
-      feature: VectorTileFeature,
-      featureState: FeatureState,
-      geometry: Array<Array<Point>>,
-      zoom: number,
-      transform: Transform,
-      pixelsToTileUnits: number,
-      pixelPosMatrix: mat4
+        queryGeometry: Array<Point>,
+        feature: VectorTileFeature,
+        featureState: FeatureState,
+        geometry: Array<Array<Point>>,
+        zoom: number,
+        transform: Transform,
+        pixelsToTileUnits: number,
+        pixelPosMatrix: mat4
     ): boolean | number {
 
         const translatedPolygon = translate(queryGeometry,

package/src/style/style_layer/fill_style_layer.ts

@@ -3,13 +3,13 @@ import StyleLayer from '../style_layer';
 import FillBucket from '../../data/bucket/fill_bucket';
 import {polygonIntersectsMultiPolygon} from '../../util/intersection_tests';
 import {translateDistance, translate} from '../query_utils';
-import properties, {FillLayoutPropsPossiblyEvaluated, FillPaintPropsPossiblyEvaluated} from './fill_style_layer_properties';
+import properties, {FillLayoutPropsPossiblyEvaluated, FillPaintPropsPossiblyEvaluated} from './fill_style_layer_properties.g';
 import {Transitionable, Transitioning, Layout, PossiblyEvaluated} from '../properties';
 
 import type {FeatureState} from '../../style-spec/expression';
 import type {BucketParameters} from '../../data/bucket';
 import type Point from '@mapbox/point-geometry';
-import type {FillLayoutProps, FillPaintProps} from './fill_style_layer_properties';
+import type {FillLayoutProps, FillPaintProps} from './fill_style_layer_properties.g';
 import type EvaluationParameters from '../evaluation_parameters';
 import type Transform from '../../geo/transform';
 import type {LayerSpecification} from '../../style-spec/types';
@@ -45,13 +45,13 @@ class FillStyleLayer extends StyleLayer {
     }
 
     queryIntersectsFeature(
-      queryGeometry: Array<Point>,
-      feature: VectorTileFeature,
-      featureState: FeatureState,
-      geometry: Array<Array<Point>>,
-      zoom: number,
-      transform: Transform,
-      pixelsToTileUnits: number
+        queryGeometry: Array<Point>,
+        feature: VectorTileFeature,
+        featureState: FeatureState,
+        geometry: Array<Array<Point>>,
+        zoom: number,
+        transform: Transform,
+        pixelsToTileUnits: number
     ): boolean {
         const translatedPolygon = translate(queryGeometry,
             this.paint.get('fill-translate'),

package/src/style/style_layer/heatmap_style_layer.ts

@@ -2,13 +2,13 @@ import StyleLayer from '../style_layer';
 
 import HeatmapBucket from '../../data/bucket/heatmap_bucket';
 import {RGBAImage} from '../../util/image';
-import properties, {HeatmapPaintPropsPossiblyEvaluated} from './heatmap_style_layer_properties';
+import properties, {HeatmapPaintPropsPossiblyEvaluated} from './heatmap_style_layer_properties.g';
 import {renderColorRamp} from '../../util/color_ramp';
 import {Transitionable, Transitioning, PossiblyEvaluated} from '../properties';
 
 import type Texture from '../../render/texture';
 import type Framebuffer from '../../gl/framebuffer';
-import type {HeatmapPaintProps} from './heatmap_style_layer_properties';
+import type {HeatmapPaintProps} from './heatmap_style_layer_properties.g';
 import type {LayerSpecification} from '../../style-spec/types';
 
 class HeatmapStyleLayer extends StyleLayer {

package/src/style/style_layer/hillshade_style_layer.ts

@@ -1,9 +1,9 @@
 import StyleLayer from '../style_layer';
 
-import properties, {HillshadePaintPropsPossiblyEvaluated} from './hillshade_style_layer_properties';
+import properties, {HillshadePaintPropsPossiblyEvaluated} from './hillshade_style_layer_properties.g';
 import {Transitionable, Transitioning, PossiblyEvaluated} from '../properties';
 
-import type {HillshadePaintProps} from './hillshade_style_layer_properties';
+import type {HillshadePaintProps} from './hillshade_style_layer_properties.g';
 import type {LayerSpecification} from '../../style-spec/types';
 
 class HillshadeStyleLayer extends StyleLayer {

package/src/style/style_layer/line_style_layer.ts

@@ -4,7 +4,7 @@ import StyleLayer from '../style_layer';
 import LineBucket from '../../data/bucket/line_bucket';
 import {polygonIntersectsBufferedMultiLine} from '../../util/intersection_tests';
 import {getMaximumPaintValue, translateDistance, translate} from '../query_utils';
-import properties, {LineLayoutPropsPossiblyEvaluated, LinePaintPropsPossiblyEvaluated} from './line_style_layer_properties';
+import properties, {LineLayoutPropsPossiblyEvaluated, LinePaintPropsPossiblyEvaluated} from './line_style_layer_properties.g';
 import {extend} from '../../util/util';
 import EvaluationParameters from '../evaluation_parameters';
 import {Transitionable, Transitioning, Layout, PossiblyEvaluated, DataDrivenProperty} from '../properties';
@@ -12,7 +12,7 @@ import {Transitionable, Transitioning, Layout, PossiblyEvaluated, DataDrivenProp
 import Step from '../../style-spec/expression/definitions/step';
 import type {FeatureState, ZoomConstantExpression} from '../../style-spec/expression';
 import type {Bucket, BucketParameters} from '../../data/bucket';
-import type {LineLayoutProps, LinePaintProps} from './line_style_layer_properties';
+import type {LineLayoutProps, LinePaintProps} from './line_style_layer_properties.g';
 import type Transform from '../../geo/transform';
 import type {LayerSpecification} from '../../style-spec/types';
 import type {VectorTileFeature} from '@mapbox/vector-tile';
@@ -88,13 +88,13 @@ class LineStyleLayer extends StyleLayer {
     }
 
     queryIntersectsFeature(
-      queryGeometry: Array<Point>,
-      feature: VectorTileFeature,
-      featureState: FeatureState,
-      geometry: Array<Array<Point>>,
-      zoom: number,
-      transform: Transform,
-      pixelsToTileUnits: number
+        queryGeometry: Array<Point>,
+        feature: VectorTileFeature,
+        featureState: FeatureState,
+        geometry: Array<Array<Point>>,
+        zoom: number,
+        transform: Transform,
+        pixelsToTileUnits: number
     ): boolean {
         const translatedPolygon = translate(queryGeometry,
             this.paint.get('line-translate'),

package/src/style/style_layer/raster_style_layer.ts

@@ -1,9 +1,9 @@
 import StyleLayer from '../style_layer';
 
-import properties, {RasterPaintPropsPossiblyEvaluated} from './raster_style_layer_properties';
+import properties, {RasterPaintPropsPossiblyEvaluated} from './raster_style_layer_properties.g';
 import {Transitionable, Transitioning, PossiblyEvaluated} from '../properties';
 
-import type {RasterPaintProps} from './raster_style_layer_properties';
+import type {RasterPaintProps} from './raster_style_layer_properties.g';
 import type {LayerSpecification} from '../../style-spec/types';
 
 class RasterStyleLayer extends StyleLayer {

package/src/style/style_layer/symbol_style_layer.ts

@@ -3,7 +3,7 @@ import StyleLayer from '../style_layer';
 import assert from 'assert';
 import SymbolBucket from '../../data/bucket/symbol_bucket';
 import resolveTokens from '../../util/resolve_tokens';
-import properties, {SymbolLayoutPropsPossiblyEvaluated, SymbolPaintPropsPossiblyEvaluated} from './symbol_style_layer_properties';
+import properties, {SymbolLayoutPropsPossiblyEvaluated, SymbolPaintPropsPossiblyEvaluated} from './symbol_style_layer_properties.g';
 
 import {
     Transitionable,
@@ -22,7 +22,7 @@ import {
 } from '../../style-spec/expression';
 
 import type {BucketParameters} from '../../data/bucket';
-import type {SymbolLayoutProps, SymbolPaintProps} from './symbol_style_layer_properties';
+import type {SymbolLayoutProps, SymbolPaintProps} from './symbol_style_layer_properties.g';
 import type EvaluationParameters from '../evaluation_parameters';
 import type {LayerSpecification} from '../../style-spec/types';
 import type {Feature, SourceExpression, CompositeExpression} from '../../style-spec/expression';
@@ -127,13 +127,13 @@ class SymbolStyleLayer extends StyleLayer {
                 expression = (new ZoomConstantExpression('source', styleExpression) as SourceExpression);
             } else {
                 expression = (new ZoomDependentExpression('composite',
-                                                          styleExpression,
-                                                          overriden.value.zoomStops,
-                                                          (overriden.value as any)._interpolationType) as CompositeExpression);
+                    styleExpression,
+                    overriden.value.zoomStops,
+                    (overriden.value as any)._interpolationType) as CompositeExpression);
             }
             this.paint._values[overridable] = new PossiblyEvaluatedPropertyValue(overriden.property,
-                                                                                 expression,
-                                                                                 overriden.parameters);
+                expression,
+                overriden.parameters);
         }
     }
 
@@ -185,4 +185,23 @@ class SymbolStyleLayer extends StyleLayer {
     }
 }
 
+export type OverlapMode = 'never' | 'always' | 'cooperative';
+
+export function getOverlapMode(layout: PossiblyEvaluated<SymbolLayoutProps, SymbolLayoutPropsPossiblyEvaluated>, overlapProp: 'icon-overlap', allowOverlapProp: 'icon-allow-overlap'): OverlapMode;
+export function getOverlapMode(layout: PossiblyEvaluated<SymbolLayoutProps, SymbolLayoutPropsPossiblyEvaluated>, overlapProp: 'text-overlap', allowOverlapProp: 'text-allow-overlap'): OverlapMode;
+export function getOverlapMode(layout: PossiblyEvaluated<SymbolLayoutProps, SymbolLayoutPropsPossiblyEvaluated>, overlapProp: 'icon-overlap' | 'text-overlap', allowOverlapProp: 'icon-allow-overlap' | 'text-allow-overlap'): OverlapMode {
+    let result: OverlapMode = 'never';
+    const overlap = layout.get(overlapProp);
+
+    if (overlap) {
+        // if -overlap is set, use it
+        result = overlap;
+    } else if (layout.get(allowOverlapProp)) {
+        // fall back to -allow-overlap, with false='never', true='always'
+        result = 'always';
+    }
+
+    return result;
+}
+
 export default SymbolStyleLayer;

package/src/style/style_layer/{symbol_style_layer_properties.ts → symbol_style_layer_properties.g.ts}

@@ -32,6 +32,7 @@ export type SymbolLayoutProps = {
     "symbol-sort-key": DataDrivenProperty<number>,
     "symbol-z-order": DataConstantProperty<"auto" | "viewport-y" | "source">,
     "icon-allow-overlap": DataConstantProperty<boolean>,
+    "icon-overlap": DataConstantProperty<"never" | "always" | "cooperative">,
     "icon-ignore-placement": DataConstantProperty<boolean>,
     "icon-optional": DataConstantProperty<boolean>,
     "icon-rotation-alignment": DataConstantProperty<"map" | "viewport" | "auto">,
@@ -65,6 +66,7 @@ export type SymbolLayoutProps = {
     "text-transform": DataDrivenProperty<"none" | "uppercase" | "lowercase">,
     "text-offset": DataDrivenProperty<[number, number]>,
     "text-allow-overlap": DataConstantProperty<boolean>,
+    "text-overlap": DataConstantProperty<"never" | "always" | "cooperative">,
     "text-ignore-placement": DataConstantProperty<boolean>,
     "text-optional": DataConstantProperty<boolean>,
 };
@@ -76,6 +78,7 @@ export type SymbolLayoutPropsPossiblyEvaluated = {
     "symbol-sort-key": PossiblyEvaluatedPropertyValue<number>,
     "symbol-z-order": "auto" | "viewport-y" | "source",
     "icon-allow-overlap": boolean,
+    "icon-overlap": "never" | "always" | "cooperative",
     "icon-ignore-placement": boolean,
     "icon-optional": boolean,
     "icon-rotation-alignment": "map" | "viewport" | "auto",
@@ -109,6 +112,7 @@ export type SymbolLayoutPropsPossiblyEvaluated = {
     "text-transform": PossiblyEvaluatedPropertyValue<"none" | "uppercase" | "lowercase">,
     "text-offset": PossiblyEvaluatedPropertyValue<[number, number]>,
     "text-allow-overlap": boolean,
+    "text-overlap": "never" | "always" | "cooperative",
     "text-ignore-placement": boolean,
     "text-optional": boolean,
 };
@@ -120,6 +124,7 @@ const layout: Properties<SymbolLayoutProps> = new Properties({
     "symbol-sort-key": new DataDrivenProperty(styleSpec["layout_symbol"]["symbol-sort-key"] as any as StylePropertySpecification),
     "symbol-z-order": new DataConstantProperty(styleSpec["layout_symbol"]["symbol-z-order"] as any as StylePropertySpecification),
     "icon-allow-overlap": new DataConstantProperty(styleSpec["layout_symbol"]["icon-allow-overlap"] as any as StylePropertySpecification),
+    "icon-overlap": new DataConstantProperty(styleSpec["layout_symbol"]["icon-overlap"] as any as StylePropertySpecification),
     "icon-ignore-placement": new DataConstantProperty(styleSpec["layout_symbol"]["icon-ignore-placement"] as any as StylePropertySpecification),
     "icon-optional": new DataConstantProperty(styleSpec["layout_symbol"]["icon-optional"] as any as StylePropertySpecification),
     "icon-rotation-alignment": new DataConstantProperty(styleSpec["layout_symbol"]["icon-rotation-alignment"] as any as StylePropertySpecification),
@@ -153,6 +158,7 @@ const layout: Properties<SymbolLayoutProps> = new Properties({
     "text-transform": new DataDrivenProperty(styleSpec["layout_symbol"]["text-transform"] as any as StylePropertySpecification),
     "text-offset": new DataDrivenProperty(styleSpec["layout_symbol"]["text-offset"] as any as StylePropertySpecification),
     "text-allow-overlap": new DataConstantProperty(styleSpec["layout_symbol"]["text-allow-overlap"] as any as StylePropertySpecification),
+    "text-overlap": new DataConstantProperty(styleSpec["layout_symbol"]["text-overlap"] as any as StylePropertySpecification),
     "text-ignore-placement": new DataConstantProperty(styleSpec["layout_symbol"]["text-ignore-placement"] as any as StylePropertySpecification),
     "text-optional": new DataConstantProperty(styleSpec["layout_symbol"]["text-optional"] as any as StylePropertySpecification),
 });

package/src/style/style_layer.ts

@@ -58,19 +58,19 @@ abstract class StyleLayer extends Evented {
 
     queryRadius?(bucket: Bucket): number;
     queryIntersectsFeature?(
-      queryGeometry: Array<Point>,
-      feature: VectorTileFeature,
-      featureState: FeatureState,
-      geometry: Array<Array<Point>>,
-      zoom: number,
-      transform: Transform,
-      pixelsToTileUnits: number,
-      pixelPosMatrix: mat4
+        queryGeometry: Array<Point>,
+        feature: VectorTileFeature,
+        featureState: FeatureState,
+        geometry: Array<Array<Point>>,
+        zoom: number,
+        transform: Transform,
+        pixelsToTileUnits: number,
+        pixelPosMatrix: mat4
     ): boolean | number;
 
     constructor(layer: LayerSpecification | CustomLayerInterface, properties: Readonly<{
-      layout?: Properties<any>;
-      paint?: Properties<any>;
+        layout?: Properties<any>;
+        paint?: Properties<any>;
     }>) {
         super();
 

package/src/style/style_layer_index.ts

@@ -12,9 +12,9 @@ export type Family<Layer extends TypedStyleLayer> = Array<Layer>;
 
 class StyleLayerIndex {
     familiesBySource: {
-      [source: string]: {
-        [sourceLayer: string]: Array<Family<any>>;
-      };
+        [source: string]: {
+            [sourceLayer: string]: Array<Family<any>>;
+        };
     };
     keyCache: {[source: string]: string};