@mapbox/mapbox-gl-style-spec 14.29.0 → 14.30.0-rc.1

package/dist/index.cjs

@@ -9658,7 +9658,9 @@
   		experimental: true,
   		"sdk-support": {
   			"basic functionality": {
-  				js: "3.29.0"
+  				js: "3.29.0",
+  				android: "11.30.0",
+  				ios: "11.30.0"
   			}
   		}
   	},
@@ -14582,14 +14584,31 @@
     }
     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) {
@@ -20719,7 +20738,7 @@ Use an identity property function instead: ${example}.`
           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,
@@ -20727,8 +20746,8 @@ Use an identity property function instead: ${example}.`
             }));
           } 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,
@@ -21220,7 +21239,8 @@ Use an identity property function instead: ${example}.`
   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);
@@ -21257,10 +21277,20 @@ Use an identity property function instead: ${example}.`
   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;
@@ -21341,6 +21371,7 @@ Use an identity property function instead: ${example}.`
       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);