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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mapbox/mapbox-gl-style-spec",
-  "version": "14.29.0",
+  "version": "14.30.0-alpha.742b92e7a62",
   "description": "a specification for mapbox gl styles",
   "author": "Mapbox",
   "license": "SEE LICENSE IN LICENSE.txt",

package/reference/v8.json

@@ -1647,6 +1647,14 @@
             }
           }
         },
+        "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": {
@@ -1667,7 +1675,7 @@
     },
     "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",
@@ -10316,6 +10324,56 @@
         ]
       },
       "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
     }
   },
   "paint_raster": {
@@ -10450,7 +10508,9 @@
       "experimental": true,
       "sdk-support": {
         "basic functionality": {
-          "js": "3.29.0"
+          "js": "3.29.0",
+          "android": "11.30.0",
+          "ios": "11.30.0"
         }
       }
     },

package/types.ts

@@ -904,7 +904,15 @@ export type SymbolLayerSpecification = {
         "icon-color-brightness-min"?: number | ExpressionSpecification,
         "icon-color-brightness-max"?: number | ExpressionSpecification,
         "symbol-z-offset"?: DataDrivenPropertyValueSpecification<number>,
-        "symbol-z-offset-transition"?: TransitionSpecification
+        "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>
 };
@@ -1524,6 +1532,21 @@ export type SlotLayerSpecification = {
     "paint"?: never
 };
 
+export 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
+};
+
 export type ClipLayerSpecification = {
     "id": string,
     "type": "clip",
@@ -1563,6 +1586,7 @@ export type LayerSpecification =
     | BackgroundLayerSpecification
     | SkyLayerSpecification
     | SlotLayerSpecification
+    | PlacementGroupLayerSpecification
     | ClipLayerSpecification;
 
 export type LayoutSpecification = UnionToIntersection<NonNullable<LayerSpecification['layout']>>;
@@ -1668,6 +1692,11 @@ export type SkyLayer = SkyLayerSpecification;
  */
 export type SlotLayer = SlotLayerSpecification;
 
+/**
+ * @deprecated Use `PlacementGroupLayerSpecification` instead.
+ */
+export type PlacementGroupLayer = PlacementGroupLayerSpecification;
+
 /**
  * @deprecated Use `ClipLayerSpecification` instead.
  */

package/util/geometry_util.ts

@@ -25,19 +25,40 @@ function compareAreas(a: Ring, b: Ring): number {
     return (b.area!) - (a.area!);
 }
 
+// Whether every point of the ring lies on a single line, i.e. the ring has no real area
+// regardless of winding
+function isCollinear(ring: Ring): boolean {
+    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; // every point coincides with p0
+
+    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;
+}
+
 // classifies an array of rings into polygons with outer rings and holes
 export function classifyRings(rings: Array<Ring>, maxRings: number): Array<Array<Ring>> {
     const len = rings.length;
 
-    if (len <= 1) return [rings];
-
     const polygons: Array<Array<Ring>> = [];
     let polygon: Array<Ring> | undefined,
         ccw: boolean | undefined;
 
     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);
 

package/validate/validate_layer.ts

@@ -72,7 +72,7 @@ export default function validateLayer(options: LayerValidatorOptions): Validatio
         } else {
             type = unbundle(parent.type) as string;
         }
-    } 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)) {

package/validate/validate_lights.ts

@@ -79,7 +79,7 @@ export default function validateLights(options: LightsValidatorOptions): Validat
                 // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
                 if (useThemeMatch && lightPropertySpec[useThemeMatch[1]!]) {
                     errors = errors.concat(validate({
-                        key,
+                        key: propertyKey,
                         value: properties[propertyKey],
                         valueSpec: {type: 'string'},
                         style,
@@ -88,8 +88,8 @@ export default function validateLights(options: LightsValidatorOptions): Validat
                 // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
                 } else if (transitionMatch && lightPropertySpec[transitionMatch[1]!] && lightPropertySpec[transitionMatch[1]!].transition) {
                     errors = errors.concat(validate({
-                        key,
-                        value: light[key],
+                        key: propertyKey,
+                        value: properties[propertyKey],
                         // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
                         valueSpec: styleSpec.transition,
                         style,

package/validate_mapbox_api_supported.ts

@@ -24,7 +24,8 @@ type MapboxStyleSpecification = StyleSpecification & {
 };
 
 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: string | null | undefined, regex: RegExp): boolean {
     if (!value || !isString(value)) return true;
@@ -78,11 +79,22 @@ function getSourceErrors(source: SourceSpecification, i: number): Array<Validati
 function getMaxSourcesErrors(sourcesCount: number): Array<ValidationError> {
     const errors: ValidationError[] = [];
     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: SourcesSpecification): Array<ValidationError> {
+    const errors: ValidationError[] = [];
+    Object.keys(sources).forEach((s: string, i: number) => {
+        const source = sources[s]!;
+        if (getSourceCount(source) > MAX_TILESETS_IN_SOURCE) {
+            errors.push(new ValidationError(`sources[${i}].url`, (source as {url?: string}).url, `Sources must contain ${MAX_TILESETS_IN_SOURCE} or fewer tilesets`));
+        }
+    });
+    return errors;
+}
+
 function getSourcesErrors(sources: SourcesSpecification): {
     errors: Array<ValidationError>;
     sourcesCount: number;
@@ -225,6 +237,7 @@ export default function validateMapboxApiSupported(style: MapboxStyleSpecificati
         const sourcesErrors = getSourcesErrors(s.sources);
         sourcesCount += sourcesErrors.sourcesCount;
         errors = errors.concat(sourcesErrors.errors);
+        errors = errors.concat(getMaxTilesetsErrors(s.sources));
     }
 
     if (s.imports) {