@mapbox/mapbox-gl-style-spec 14.29.0 → 14.30.0-alpha.742b92e7a62

package/dist/index.d.ts

@@ -1574,6 +1574,14 @@ declare const _exports: {
                         };
                     };
                 };
+                "placement-group": {
+                    doc: string;
+                    "sdk-support": {
+                        "basic functionality": {};
+                    };
+                    private: boolean;
+                    experimental: boolean;
+                };
                 clip: {
                     doc: string;
                     "sdk-support": {
@@ -9136,6 +9144,42 @@ declare const _exports: {
             };
             "property-type": string;
         };
+        "placement-priority": {
+            type: string;
+            doc: string;
+            default: number;
+            minimum: number;
+            transition: boolean;
+            appearance: boolean;
+            expression: {
+                interpolated: boolean;
+                parameters: string[];
+            };
+            "property-type": string;
+            "sdk-support": {
+                "basic functionality": {};
+                "data-driven styling": {};
+            };
+            private: boolean;
+            experimental: boolean;
+        };
+        "placement-group": {
+            type: string;
+            doc: string;
+            transition: boolean;
+            appearance: boolean;
+            expression: {
+                interpolated: boolean;
+                parameters: string[];
+            };
+            "property-type": string;
+            "sdk-support": {
+                "basic functionality": {};
+                "data-driven styling": {};
+            };
+            private: boolean;
+            experimental: boolean;
+        };
     };
     paint_raster: {
         "raster-opacity": {
@@ -9244,6 +9288,8 @@ declare const _exports: {
             "sdk-support": {
                 "basic functionality": {
                     js: string;
+                    android: string;
+                    ios: string;
                 };
             };
         };
@@ -11427,6 +11473,14 @@ type SymbolLayerSpecification = {
         "icon-color-brightness-max"?: number | ExpressionSpecification;
         "symbol-z-offset"?: DataDrivenPropertyValueSpecification<number>;
         "symbol-z-offset-transition"?: TransitionSpecification;
+        /**
+         * @experimental This property is experimental and subject to change in future versions.
+         */
+        "placement-priority"?: DataDrivenPropertyValueSpecification<number>;
+        /**
+         * @experimental This property is experimental and subject to change in future versions.
+         */
+        "placement-group"?: DataDrivenPropertyValueSpecification<string>;
     };
     "appearances"?: Array<AppearanceSpecification>;
 };
@@ -12012,6 +12066,20 @@ type SlotLayerSpecification = {
     "layout"?: never;
     "paint"?: never;
 };
+type PlacementGroupLayerSpecification = {
+    "id": string;
+    "type": "placement-group";
+    "metadata"?: unknown;
+    "source"?: never;
+    "source-layer"?: never;
+    "slot"?: string;
+    "minzoom"?: never;
+    "maxzoom"?: never;
+    "filter"?: never;
+    "appearances"?: Array<AppearanceSpecification>;
+    "layout"?: never;
+    "paint"?: never;
+};
 type ClipLayerSpecification = {
     "id": string;
     "type": "clip";
@@ -12034,7 +12102,7 @@ type ClipLayerSpecification = {
  * @deprecated Use `ClipLayerSpecification['layout']` instead.
  */
 type ClipLayout = ClipLayerSpecification['layout'];
-type LayerSpecification = FillLayerSpecification | LineLayerSpecification | SymbolLayerSpecification | CircleLayerSpecification | HeatmapLayerSpecification | FillExtrusionLayerSpecification | BuildingLayerSpecification | RasterLayerSpecification | RasterParticleLayerSpecification | HillshadeLayerSpecification | ModelLayerSpecification | BackgroundLayerSpecification | SkyLayerSpecification | SlotLayerSpecification | ClipLayerSpecification;
+type LayerSpecification = FillLayerSpecification | LineLayerSpecification | SymbolLayerSpecification | CircleLayerSpecification | HeatmapLayerSpecification | FillExtrusionLayerSpecification | BuildingLayerSpecification | RasterLayerSpecification | RasterParticleLayerSpecification | HillshadeLayerSpecification | ModelLayerSpecification | BackgroundLayerSpecification | SkyLayerSpecification | SlotLayerSpecification | PlacementGroupLayerSpecification | ClipLayerSpecification;
 type LayoutSpecification = UnionToIntersection<NonNullable<LayerSpecification['layout']>>;
 type PaintSpecification = UnionToIntersection<NonNullable<LayerSpecification['paint']>>;
 type LayerBaseSpecification = Pick<LayerSpecification, "slot" | "minzoom" | "maxzoom" | "filter" | "appearances">;
@@ -12103,6 +12171,10 @@ type SkyLayer = SkyLayerSpecification;
  * @deprecated Use `SlotLayerSpecification` instead.
  */
 type SlotLayer = SlotLayerSpecification;
+/**
+ * @deprecated Use `PlacementGroupLayerSpecification` instead.
+ */
+type PlacementGroupLayer = PlacementGroupLayerSpecification;
 /**
  * @deprecated Use `ClipLayerSpecification` instead.
  */
@@ -12987,4 +13059,4 @@ declare const visit: {
 };
 
 export { Color, ParsingError$1 as ParsingError, ValidationError$1 as ValidationError, export_default as composite, convertFilter, derefLayers, diffStyles as diff, expression, createFilter as featureFilter, format, styleFunction as function, _default as latest, export_default$1 as migrate, _exports as v8, validateStyle as validate, validateMapboxApiSupported, visit };
-export type { AmbientLightSpecification, AnyLayer, AnyLayout, AnyPaint, AnySourceData, AppearanceSpecification, ArrayPropertySpecification, BackgroundLayer, BackgroundLayerSpecification, BackgroundLayout, BackgroundPaint, BooleanPropertySpecification, BuildingLayer, BuildingLayerSpecification, BuildingLayout, BuildingPaint, CameraFunctionSpecification, CameraSpecification, CircleLayer, CircleLayerSpecification, CircleLayout, CirclePaint, ClipLayer, ClipLayerSpecification, ClipLayout, ColorPropertySpecification, ColorSpecification, ColorThemeSpecification, CompositeFunctionSpecification, ConfigSpecification, DataDrivenPropertyValueSpecification, DirectionalLightSpecification, EnumPropertySpecification, Expression$1 as Expression, ExpressionSpecification, FeaturesetSpecification, FeaturesetsSpecification, FillExtrusionLayer, FillExtrusionLayerSpecification, FillExtrusionLayout, FillExtrusionPaint, FillLayer, FillLayerSpecification, FillLayout, FillPaint, FilterSpecification, FlatLightSpecification, FogSpecification, FormattedPropertySpecification, FormattedSpecification, FunctionSpecification, GeoJSONSourceSpecification, HeatmapLayer, HeatmapLayerSpecification, HeatmapLayout, HeatmapPaint, HillshadeLayer, HillshadeLayerSpecification, HillshadeLayout, HillshadePaint, IconsetSpecification, IconsetsSpecification, ImageSourceSpecification, ImportSpecification, IndoorSourceSpecification, IndoorSpecification, Layer, LayerBaseSpecification, LayerSpecification, LayoutSpecification, LightSpecification, LightsSpecification, LineLayer, LineLayerSpecification, LineLayout, LinePaint, ModelLayer, ModelLayerSpecification, ModelLayout, ModelLightOverridesSpecification, ModelMaterialOverrideSpecification, ModelMaterialOverridesSpecification, ModelNodeOverrideSpecification, ModelNodeOverridesSpecification, ModelPaint, ModelSourceModelSpecification, ModelSourceModelsSpecification, ModelSourceSpecification, ModelSpecification, ModelsSpecification, NumberPropertySpecification, OptionSpecification, PaintSpecification, Projection, ProjectionSpecification, PromoteIdSpecification, PropertyExpressionSpecification, PropertyFunctionStop, PropertyValueSpecification, RainSpecification, RasterArraySourceSpecification, RasterDEMSourceSpecification, RasterLayer, RasterLayerSpecification, RasterLayout, RasterPaint, RasterParticleLayer, RasterParticleLayerSpecification, RasterParticleLayout, RasterParticlePaint, RasterSourceSpecification, ResolvedImagePropertySpecification, ResolvedImageSpecification, SchemaSpecification, SelectorPropertySpecification, SelectorSpecification, SkyLayer, SkyLayerSpecification, SkyLayout, SkyPaint, SlotLayer, SlotLayerSpecification, SnowSpecification, SourceFunctionSpecification, SourceSpecification, Sources, SourcesSpecification, StringPropertySpecification, Style, StylePropertySpecification, StyleSpecification, SymbolLayer, SymbolLayerSpecification, SymbolLayout, SymbolPaint, TerrainSpecification, TerrainSpecificationUpdate, Transition, TransitionSpecification, VectorSourceSpecification, VideoSourceSpecification, ZoomAndPropertyFunctionStop };
+export type { AmbientLightSpecification, AnyLayer, AnyLayout, AnyPaint, AnySourceData, AppearanceSpecification, ArrayPropertySpecification, BackgroundLayer, BackgroundLayerSpecification, BackgroundLayout, BackgroundPaint, BooleanPropertySpecification, BuildingLayer, BuildingLayerSpecification, BuildingLayout, BuildingPaint, CameraFunctionSpecification, CameraSpecification, CircleLayer, CircleLayerSpecification, CircleLayout, CirclePaint, ClipLayer, ClipLayerSpecification, ClipLayout, ColorPropertySpecification, ColorSpecification, ColorThemeSpecification, CompositeFunctionSpecification, ConfigSpecification, DataDrivenPropertyValueSpecification, DirectionalLightSpecification, EnumPropertySpecification, Expression$1 as Expression, ExpressionSpecification, FeaturesetSpecification, FeaturesetsSpecification, FillExtrusionLayer, FillExtrusionLayerSpecification, FillExtrusionLayout, FillExtrusionPaint, FillLayer, FillLayerSpecification, FillLayout, FillPaint, FilterSpecification, FlatLightSpecification, FogSpecification, FormattedPropertySpecification, FormattedSpecification, FunctionSpecification, GeoJSONSourceSpecification, HeatmapLayer, HeatmapLayerSpecification, HeatmapLayout, HeatmapPaint, HillshadeLayer, HillshadeLayerSpecification, HillshadeLayout, HillshadePaint, IconsetSpecification, IconsetsSpecification, ImageSourceSpecification, ImportSpecification, IndoorSourceSpecification, IndoorSpecification, Layer, LayerBaseSpecification, LayerSpecification, LayoutSpecification, LightSpecification, LightsSpecification, LineLayer, LineLayerSpecification, LineLayout, LinePaint, ModelLayer, ModelLayerSpecification, ModelLayout, ModelLightOverridesSpecification, ModelMaterialOverrideSpecification, ModelMaterialOverridesSpecification, ModelNodeOverrideSpecification, ModelNodeOverridesSpecification, ModelPaint, ModelSourceModelSpecification, ModelSourceModelsSpecification, ModelSourceSpecification, ModelSpecification, ModelsSpecification, NumberPropertySpecification, OptionSpecification, PaintSpecification, PlacementGroupLayer, PlacementGroupLayerSpecification, Projection, ProjectionSpecification, PromoteIdSpecification, PropertyExpressionSpecification, PropertyFunctionStop, PropertyValueSpecification, RainSpecification, RasterArraySourceSpecification, RasterDEMSourceSpecification, RasterLayer, RasterLayerSpecification, RasterLayout, RasterPaint, RasterParticleLayer, RasterParticleLayerSpecification, RasterParticleLayout, RasterParticlePaint, RasterSourceSpecification, ResolvedImagePropertySpecification, ResolvedImageSpecification, SchemaSpecification, SelectorPropertySpecification, SelectorSpecification, SkyLayer, SkyLayerSpecification, SkyLayout, SkyPaint, SlotLayer, SlotLayerSpecification, SnowSpecification, SourceFunctionSpecification, SourceSpecification, Sources, SourcesSpecification, StringPropertySpecification, Style, StylePropertySpecification, StyleSpecification, SymbolLayer, SymbolLayerSpecification, SymbolLayout, SymbolPaint, TerrainSpecification, TerrainSpecificationUpdate, Transition, TransitionSpecification, VectorSourceSpecification, VideoSourceSpecification, ZoomAndPropertyFunctionStop };

package/dist/index.es.js

@@ -1618,6 +1618,15 @@ var layer = {
 					}
 				}
 			},
+			"placement-group": {
+				doc: "Marks a placement priority group relative to other layers, going from lower to higher priority. Symbols from groups with higher priorities will be placed first",
+				"sdk-support": {
+					"basic functionality": {
+					}
+				},
+				"private": true,
+				experimental: true
+			},
 			clip: {
 				doc: "Layer that removes 3D content from map.",
 				"sdk-support": {
@@ -1638,7 +1647,7 @@ var layer = {
 	},
 	source: {
 		type: "string",
-		doc: "Name of a source description to be used for this layer. Required for all layer types except `background` and `slot`."
+		doc: "Name of a source description to be used for this layer. Required for all layer types except `background`, `slot`, and `placement-group`."
 	},
 	"source-layer": {
 		type: "string",
@@ -9514,6 +9523,60 @@ var paint_symbol = {
 			]
 		},
 		"property-type": "data-driven"
+	},
+	"placement-priority": {
+		type: "number",
+		doc: "In-group placement priority. Higher values are placed first within the symbol's placement group.",
+		"default": 0,
+		minimum: 0,
+		transition: false,
+		appearance: true,
+		expression: {
+			interpolated: true,
+			parameters: [
+				"zoom",
+				"pitch",
+				"feature",
+				"feature-state",
+				"measure-light",
+				"distance-from-center"
+			]
+		},
+		"property-type": "data-driven",
+		"sdk-support": {
+			"basic functionality": {
+			},
+			"data-driven styling": {
+			}
+		},
+		"private": true,
+		experimental: true
+	},
+	"placement-group": {
+		type: "string",
+		doc: "Assigns this symbol layer to the specified placement-group layer, placing its symbols as if they were drawn within that group. When unset, the layer's symbols use an implicitly created placement group located at the same position as the symbol layer.",
+		transition: false,
+		appearance: true,
+		expression: {
+			interpolated: false,
+			parameters: [
+				"zoom",
+				"pitch",
+				"feature",
+				"feature-state",
+				"measure-light",
+				"distance-from-center"
+			]
+		},
+		"property-type": "data-driven",
+		"sdk-support": {
+			"basic functionality": {
+			},
+			"data-driven styling": {
+			}
+		},
+		"private": true,
+		experimental: true
 	}
 };
 var paint_raster = {
@@ -9652,7 +9715,9 @@ var paint_raster = {
 		experimental: true,
 		"sdk-support": {
 			"basic functionality": {
-				js: "3.29.0"
+				js: "3.29.0",
+				android: "11.30.0",
+				ios: "11.30.0"
 			}
 		}
 	},
@@ -14576,14 +14641,31 @@ function calculateSignedArea(ring) {
   }
   return sum;
 }
+function isCollinear(ring) {
+  const len = ring.length;
+  if (len < 3) return true;
+  const p0 = ring[0];
+  let dx = 0, dy = 0, i = 1;
+  for (; i < len; i++) {
+    dx = ring[i].x - p0.x;
+    dy = ring[i].y - p0.y;
+    if (dx !== 0 || dy !== 0) break;
+  }
+  if (i === len) return true;
+  for (; i < len; i++) {
+    const px = ring[i].x - p0.x;
+    const py = ring[i].y - p0.y;
+    if (dx * py - dy * px !== 0) return false;
+  }
+  return true;
+}
 function classifyRings(rings, maxRings) {
   const len = rings.length;
-  if (len <= 1) return [rings];
   const polygons = [];
   let polygon, ccw;
   for (let i = 0; i < len; i++) {
     const area = calculateSignedArea(rings[i]);
-    if (area === 0) continue;
+    if (area === 0 && isCollinear(rings[i])) continue;
     rings[i].area = Math.abs(area);
     if (ccw === void 0) ccw = area < 0;
     if (ccw === area < 0) {
@@ -20329,7 +20411,7 @@ function validateLayer(options) {
     } else {
       type = unbundle(parent.type);
     }
-  } else if (!(type === "background" || type === "sky" || type === "slot")) {
+  } else if (!(type === "background" || type === "sky" || type === "slot" || type === "placement-group")) {
     if (!layer.source) {
       errors.push(new ValidationError(key, layer, 'missing required property "source"'));
     } else if (!isString(layer.source)) {
@@ -20713,7 +20795,7 @@ function validateLights(options) {
         const useThemeMatch = propertyKey.match(USE_THEME_KEY_RE);
         if (useThemeMatch && lightPropertySpec[useThemeMatch[1]]) {
           errors = errors.concat(validate({
-            key: key2,
+            key: propertyKey,
             value: properties[propertyKey],
             valueSpec: { type: "string" },
             style,
@@ -20721,8 +20803,8 @@ function validateLights(options) {
           }));
         } else if (transitionMatch && lightPropertySpec[transitionMatch[1]] && lightPropertySpec[transitionMatch[1]].transition) {
           errors = errors.concat(validate({
-            key: key2,
-            value: light[key2],
+            key: propertyKey,
+            value: properties[propertyKey],
             // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
             valueSpec: styleSpec.transition,
             style,
@@ -21214,7 +21296,8 @@ const MAPBOX_GLYPH_URL_RE = /^mapbox:\/\/fonts\/([^/]*)\/{fontstack}\/{range}.pb
 const MAPBOX_SPRITE_URL_RE = /^mapbox:\/\/sprites\/([^/]*)\/([^/]*)\/?([^/]*)?$/;
 const VISIBILITY_RE = /^(public|private)$/;
 const SUPPORTED_SPEC_VERSION = 8;
-const MAX_SOURCES_IN_STYLE = 15;
+const MAX_SOURCES_IN_STYLE = 64;
+const MAX_TILESETS_IN_SOURCE = 15;
 function isValid(value, regex) {
   if (!value || !isString(value)) return true;
   return !!value.match(regex);
@@ -21251,10 +21334,20 @@ function getSourceErrors(source, i) {
 function getMaxSourcesErrors(sourcesCount) {
   const errors = [];
   if (sourcesCount > MAX_SOURCES_IN_STYLE) {
-    errors.push(new ValidationError("sources", null, `Styles must contain ${MAX_SOURCES_IN_STYLE} or fewer sources`));
+    errors.push(new ValidationError("sources", null, `Styles must contain ${MAX_SOURCES_IN_STYLE} or fewer tilesets`));
   }
   return errors;
 }
+function getMaxTilesetsErrors(sources) {
+  const errors = [];
+  Object.keys(sources).forEach((s, i) => {
+    const source = sources[s];
+    if (getSourceCount(source) > MAX_TILESETS_IN_SOURCE) {
+      errors.push(new ValidationError(`sources[${i}].url`, source.url, `Sources must contain ${MAX_TILESETS_IN_SOURCE} or fewer tilesets`));
+    }
+  });
+  return errors;
+}
 function getSourcesErrors(sources) {
   const errors = [];
   let sourcesCount = 0;
@@ -21335,6 +21428,7 @@ function validateMapboxApiSupported(style, styleSpec = v8) {
     const sourcesErrors = getSourcesErrors(s.sources);
     sourcesCount += sourcesErrors.sourcesCount;
     errors = errors.concat(sourcesErrors.errors);
+    errors = errors.concat(getMaxTilesetsErrors(s.sources));
   }
   if (s.imports) {
     const importsErrors = getImportErrors(s.imports);