@mapbox/mapbox-gl-style-spec 13.27.0 → 13.28.0

package/expression/index.js

@@ -33,7 +33,7 @@ export type Feature = {
     +type: 1 | 2 | 3 | 'Unknown' | 'Point' | 'LineString' | 'Polygon',
     +id?: number | null,
     +properties: {[_: string]: any},
-    +patterns?: {[_: string]: {"min": string, "mid": string, "max": string}},
+    +patterns?: {[_: string]: string},
     +geometry?: Array<Array<Point>>
 };
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mapbox/mapbox-gl-style-spec",
   "description": "a specification for mapbox gl styles",
-  "version": "13.27.0",
+  "version": "13.28.0",
   "author": "Mapbox",
   "keywords": [
     "mapbox",

package/reference/v8.json

@@ -4431,7 +4431,7 @@
     },
     "fill-pattern": {
       "type": "resolvedImage",
-      "transition": true,
+      "transition": false,
       "doc": "Name of image in sprite to use for drawing image fills. For seamless patterns, image width and height must be a factor of two (2, 4, 8, ..., 512). Note that zoom-dependent expressions will be evaluated only at integer zoom levels.",
       "sdk-support": {
         "basic functionality": {
@@ -4454,7 +4454,7 @@
           "feature"
         ]
       },
-      "property-type": "cross-faded-data-driven"
+      "property-type": "data-driven"
     }
   },
   "paint_fill-extrusion": {
@@ -4575,7 +4575,7 @@
     },
     "fill-extrusion-pattern": {
       "type": "resolvedImage",
-      "transition": true,
+      "transition": false,
       "doc": "Name of image in sprite to use for drawing images on extruded fills. For seamless patterns, image width and height must be a factor of two (2, 4, 8, ..., 512). Note that zoom-dependent expressions will be evaluated only at integer zoom levels.",
       "sdk-support": {
         "basic functionality": {
@@ -4598,7 +4598,7 @@
           "feature"
         ]
       },
-      "property-type": "cross-faded-data-driven"
+      "property-type": "data-driven"
     },
     "fill-extrusion-height": {
       "type": "number",
@@ -4987,7 +4987,7 @@
       "value": "number",
       "doc": "Specifies the lengths of the alternating dashes and gaps that form the dash pattern. The lengths are later scaled by the line width. To convert a dash length to pixels, multiply the length by the current line width. Note that GeoJSON sources with `lineMetrics: true` specified won't render dashed lines to the expected scale. Also note that zoom-dependent expressions will be evaluated only at integer zoom levels.",
       "minimum": 0,
-      "transition": true,
+      "transition": false,
       "units": "line widths",
       "requires": [
         {
@@ -5012,11 +5012,11 @@
           "feature"
         ]
       },
-      "property-type": "cross-faded-data-driven"
+      "property-type": "data-driven"
     },
     "line-pattern": {
       "type": "resolvedImage",
-      "transition": true,
+      "transition": false,
       "doc": "Name of image in sprite to use for drawing image lines. For seamless patterns, image width must be a factor of two (2, 4, 8, ..., 512). Note that zoom-dependent expressions will be evaluated only at integer zoom levels.",
       "sdk-support": {
         "basic functionality": {
@@ -5039,7 +5039,7 @@
           "feature"
         ]
       },
-      "property-type": "cross-faded-data-driven"
+      "property-type": "data-driven"
     },
     "line-gradient": {
       "type": "color",
@@ -6396,7 +6396,7 @@
     },
     "background-pattern": {
       "type": "resolvedImage",
-      "transition": true,
+      "transition": false,
       "doc": "Name of image in sprite to use for drawing an image background. For seamless patterns, image width and height must be a factor of two (2, 4, 8, ..., 512). Note that zoom-dependent expressions will be evaluated only at integer zoom levels.",
       "sdk-support": {
         "basic functionality": {
@@ -6404,8 +6404,7 @@
           "android": "2.0.1",
           "ios": "2.0.0",
           "macos": "0.1.0"
-        },
-        "data-driven styling": {}
+        }
       },
       "expression": {
         "interpolated": false,
@@ -6413,7 +6412,7 @@
           "zoom"
         ]
       },
-      "property-type": "cross-faded"
+      "property-type": "data-constant"
     },
     "background-opacity": {
       "type": "number",
@@ -6697,14 +6696,6 @@
       "type": "property-type",
       "doc": "Property is interpolable and can be represented using a property expression."
     },
-    "cross-faded": {
-      "type": "property-type",
-      "doc": "Property is non-interpolable; rather, its values will be cross-faded to smoothly transition between integer zooms."
-    },
-    "cross-faded-data-driven": {
-      "type": "property-type",
-      "doc": "Property is non-interpolable; rather, its values will be cross-faded to smoothly transition between integer zooms. It can be represented using a property expression."
-    },
     "color-ramp": {
       "type": "property-type",
       "doc": "Property should be specified using a color ramp from which the output color can be sampled based on a property calculation."

package/style-spec.js

@@ -1,6 +1,6 @@
 // @flow
 
-type ExpressionType = 'data-driven' | 'cross-faded' | 'cross-faded-data-driven' | 'color-ramp' | 'data-constant' | 'constant';
+type ExpressionType = 'data-driven' | 'color-ramp' | 'data-constant' | 'constant';
 type ExpressionParameters = Array<'zoom' | 'feature' | 'feature-state' | 'heatmap-density' | 'line-progress' | 'sky-radial-progress' | 'pitch' | 'distance-from-center'>;
 
 type ExpressionSpecification = {

package/util/properties.js

@@ -3,7 +3,7 @@
 import type {StylePropertySpecification} from '../style-spec.js';
 
 export function supportsPropertyExpression(spec: StylePropertySpecification): boolean {
-    return spec['property-type'] === 'data-driven' || spec['property-type'] === 'cross-faded-data-driven';
+    return spec['property-type'] === 'data-driven';
 }
 
 export function supportsZoomExpression(spec: StylePropertySpecification): boolean {

package/validate/validate_source.js

@@ -94,13 +94,23 @@ export default function validateSource(options: ValidationOptions): Array<Valida
         return validateEnum({
             key: `${key}.type`,
             value: value.type,
-            valueSpec: {values: ['vector', 'raster', 'raster-dem', 'geojson', 'video', 'image']},
+            valueSpec: {values: getSourceTypeValues(styleSpec)},
             style,
             styleSpec
         });
     }
 }
 
+function getSourceTypeValues(styleSpec) {
+    return styleSpec.source.reduce((memo, source) => {
+        const sourceType = styleSpec[source];
+        if (sourceType.type.type === 'enum') {
+            memo = memo.concat(Object.keys(sourceType.type.values));
+        }
+        return memo;
+    }, []);
+}
+
 function validatePromoteId({key, value}) {
     if (getType(value) === 'string') {
         return validateString({key, value});

package/validate_mapbox_api_supported.js

@@ -167,7 +167,7 @@ function getRootErrors(style: Object, specKeys: Array<any>): Array<ValidationErr
  *   var validateMapboxApiSupported = require('mapbox-gl-style-spec/lib/validate_style_mapbox_api_supported.js');
  *   var errors = validateMapboxApiSupported(style);
  */
-export default function validateMapboxApiSupported(style: Object): ValidationErrors {
+export default function validateMapboxApiSupported(style: Object, styleSpec: Object = v8): ValidationErrors {
     let s = style;
     try {
         s = readStyle(s);
@@ -175,7 +175,7 @@ export default function validateMapboxApiSupported(style: Object): ValidationErr
         return [e];
     }
 
-    let errors = validateStyle(s, v8)
+    let errors = validateStyle(s, styleSpec)
         .concat(getRootErrors(s, Object.keys(v8.$root)));
 
     if (s.sources) {