@mapbox/mapbox-gl-style-spec 13.28.0-beta.1 → 14.0.0-beta.1

package/CHANGELOG.md

@@ -1,14 +1,3 @@
-## 13.28.0-beta.1
-
-### Features ✨
-
-* Add optional spec parameter to `validateMapboxApiSupported` ([#12448](https://github.com/mapbox/mapbox-gl-js/pull/12448))
-* Derive source type values from spec ([#12449](https://github.com/mapbox/mapbox-gl-js/pull/12449))
-
-### Bug fixes 🐞
-
-* Fix incorrect transition flag in *-pattern and line-dasharray properties ([#12372](https://github.com/mapbox/mapbox-gl-js/pull/12372))
-
 ## 13.27.0
 
 ### Bug fixes 🐞

package/bin/gl-style-composite.js

@@ -6,9 +6,9 @@
 import fs from 'fs';
 import minimist from 'minimist';
 
-/* eslint import/no-unresolved: [error, { ignore: ['^@mapbox/mapbox-gl-style-spec$'] }] */
+/* eslint import/no-unresolved: [error, { ignore: ['^@mapbox/mapbox-gl-style-spec-private$'] }] */
 /* $FlowFixMe[cannot-resolve-module] */
-import {format, composite} from '@mapbox/mapbox-gl-style-spec';
+import {format, composite} from '@mapbox/mapbox-gl-style-spec-private';
 
 const argv = minimist(process.argv.slice(2));
 

package/bin/gl-style-format.js

@@ -6,9 +6,9 @@
 import fs from 'fs';
 import minimist from 'minimist';
 
-/* eslint import/no-unresolved: [error, { ignore: ['^@mapbox/mapbox-gl-style-spec$'] }] */
+/* eslint import/no-unresolved: [error, { ignore: ['^@mapbox/mapbox-gl-style-spec-private$'] }] */
 /* $FlowFixMe[cannot-resolve-module] */
-import {format} from '@mapbox/mapbox-gl-style-spec';
+import {format} from '@mapbox/mapbox-gl-style-spec-private';
 
 const argv = minimist(process.argv.slice(2));
 

package/bin/gl-style-migrate.js

@@ -6,9 +6,9 @@
 import fs from 'fs';
 import minimist from 'minimist';
 
-/* eslint import/no-unresolved: [error, { ignore: ['^@mapbox/mapbox-gl-style-spec$'] }] */
+/* eslint import/no-unresolved: [error, { ignore: ['^@mapbox/mapbox-gl-style-spec-private$'] }] */
 /* $FlowFixMe[cannot-resolve-module] */
-import {format, migrate} from '@mapbox/mapbox-gl-style-spec';
+import {format, migrate} from '@mapbox/mapbox-gl-style-spec-private';
 
 const argv = minimist(process.argv.slice(2));
 

package/bin/gl-style-validate.js

@@ -6,9 +6,9 @@
 import rw from 'rw';
 import minimist from 'minimist';
 
-/* eslint import/no-unresolved: [error, { ignore: ['^@mapbox/mapbox-gl-style-spec$'] }] */
+/* eslint import/no-unresolved: [error, { ignore: ['^@mapbox/mapbox-gl-style-spec-private$'] }] */
 /* $FlowFixMe[cannot-resolve-module] */
-import {validate, validateMapboxApiSupported} from '@mapbox/mapbox-gl-style-spec';
+import {validate, validateMapboxApiSupported} from '@mapbox/mapbox-gl-style-spec-private';
 
 const argv = minimist(process.argv.slice(2), {
     boolean: ['json', 'mapbox-api-supported'],

package/data/extent.js

@@ -0,0 +1,18 @@
+// @flow
+
+/**
+ * The maximum value of a coordinate in the internal tile coordinate system. Coordinates of
+ * all source features normalized to this extent upon load.
+ *
+ * The value is a consequence of the following:
+ *
+ * * Vertex buffer store positions as signed 16 bit integers.
+ * * One bit is lost for signedness to support tile buffers.
+ * * One bit is lost because the line vertex buffer used to pack 1 bit of other data into the int.
+ * * One bit is lost to support features extending past the extent on the right edge of the tile.
+ * * This leaves us with 2^13 = 8192
+ *
+ * @private
+ * @readonly
+ */
+export default 8192;

package/deref.js

@@ -38,7 +38,7 @@ function deref(layer: LayerSpecification, parent: LayerSpecification): LayerSpec
 export default function derefLayers(layers: Array<LayerSpecification>): Array<LayerSpecification> {
     layers = layers.slice();
 
-    const map = Object.create(null);
+    const map: Object = Object.create(null);
     for (let i = 0; i < layers.length; i++) {
         map[layers[i].id] = layers[i];
     }

package/diff.js

@@ -2,7 +2,9 @@
 
 import isEqual from './util/deep_equal.js';
 
-import type {StyleSpecification} from './types.js';
+import type {StyleSpecification, SourceSpecification, LayerSpecification} from './types.js';
+
+type Sources = { [string]: SourceSpecification };
 
 type Command = {
     command: string;
@@ -116,27 +118,37 @@ export const operations: {[_: string]: string} = {
      */
     setFog: 'setFog',
 
+    /*
+     *  { command: 'setCamera', args: [cameraProperties] }
+     */
+    setCamera: 'setCamera',
+
+    /*
+     *  { command: 'setLights', args: [{light-3d},...] }
+     */
+    setLights: 'setLights',
+
     /*
      *  { command: 'setProjection', args: [projectionProperties] }
      */
     setProjection: 'setProjection'
 };
 
-function addSource(sourceId, after, commands) {
+function addSource(sourceId: string, after: Sources, commands: Array<Command>) {
     commands.push({command: operations.addSource, args: [sourceId, after[sourceId]]});
 }
 
-function removeSource(sourceId, commands, sourcesRemoved) {
+function removeSource(sourceId: string, commands: Array<Command>, sourcesRemoved: {[string]: true}) {
     commands.push({command: operations.removeSource, args: [sourceId]});
     sourcesRemoved[sourceId] = true;
 }
 
-function updateSource(sourceId, after, commands, sourcesRemoved) {
+function updateSource(sourceId: string, after: Sources, commands: Array<Command>, sourcesRemoved: {[string]: true}) {
     removeSource(sourceId, commands, sourcesRemoved);
     addSource(sourceId, after, commands);
 }
 
-function canUpdateGeoJSON(before, after, sourceId) {
+function canUpdateGeoJSON(before: Sources, after: Sources, sourceId: string) {
     let prop;
     for (prop in before[sourceId]) {
         if (!before[sourceId].hasOwnProperty(prop)) continue;
@@ -153,7 +165,7 @@ function canUpdateGeoJSON(before, after, sourceId) {
     return true;
 }
 
-function diffSources(before, after, commands, sourcesRemoved) {
+function diffSources(before: Sources, after: Sources, commands: Array<Command>, sourcesRemoved: {[string]: true}) {
     before = before || {};
     after = after || {};
 
@@ -170,11 +182,12 @@ function diffSources(before, after, commands, sourcesRemoved) {
     // look for sources to add/update
     for (sourceId in after) {
         if (!after.hasOwnProperty(sourceId)) continue;
+        const source = after[sourceId];
         if (!before.hasOwnProperty(sourceId)) {
             addSource(sourceId, after, commands);
-        } else if (!isEqual(before[sourceId], after[sourceId])) {
-            if (before[sourceId].type === 'geojson' && after[sourceId].type === 'geojson' && canUpdateGeoJSON(before, after, sourceId)) {
-                commands.push({command: operations.setGeoJSONSourceData, args: [sourceId, after[sourceId].data]});
+        } else if (!isEqual(before[sourceId], source)) {
+            if (before[sourceId].type === 'geojson' && source.type === 'geojson' && canUpdateGeoJSON(before, after, sourceId)) {
+                commands.push({command: operations.setGeoJSONSourceData, args: [sourceId, source.data]});
             } else {
                 // no update command, must remove then add
                 updateSource(sourceId, after, commands, sourcesRemoved);
@@ -183,7 +196,7 @@ function diffSources(before, after, commands, sourcesRemoved) {
     }
 }
 
-function diffLayerPropertyChanges(before, after, commands, layerId, klass, command) {
+function diffLayerPropertyChanges(before: any, after: any, commands: Array<Command>, layerId: string, klass: ?string, command: string) {
     before = before || {};
     after = after || {};
 
@@ -203,15 +216,16 @@ function diffLayerPropertyChanges(before, after, commands, layerId, klass, comma
     }
 }
 
-function pluckId(layer) {
+function pluckId(layer: LayerSpecification) {
     return layer.id;
 }
-function indexById(group, layer) {
+
+function indexById(group: {[string]: LayerSpecification}, layer: LayerSpecification) {
     group[layer.id] = layer;
     return group;
 }
 
-function diffLayers(before, after, commands) {
+function diffLayers(before: Array<LayerSpecification>, after: Array<LayerSpecification>, commands: Array<Command>) {
     before = before || [];
     after = after || [];
 
@@ -227,9 +241,9 @@ function diffLayers(before, after, commands) {
     const tracker = beforeOrder.slice();
 
     // layers that have been added do not need to be diffed
-    const clean = Object.create(null);
+    const clean: Object = Object.create(null);
 
-    let i, d, layerId, beforeLayer, afterLayer, insertBeforeLayerId, prop;
+    let i, d, layerId, beforeLayer: LayerSpecification, afterLayer: LayerSpecification, insertBeforeLayerId, prop;
 
     // remove layers
     for (i = 0, d = 0; i < beforeOrder.length; i++) {
@@ -277,6 +291,7 @@ function diffLayers(before, after, commands) {
 
         // If source, source-layer, or type have changes, then remove the layer
         // and add it back 'from scratch'.
+        // $FlowFixMe[prop-missing] - there is no `source-layer` in background and sky layers
         if (!isEqual(beforeLayer.source, afterLayer.source) || !isEqual(beforeLayer['source-layer'], afterLayer['source-layer']) || !isEqual(beforeLayer.type, afterLayer.type)) {
             commands.push({command: operations.removeLayer, args: [layerId]});
             // we add the layer back at the same position it was already in, so
@@ -378,6 +393,12 @@ export default function diffStyles(before: StyleSpecification, after: StyleSpeci
         if (!isEqual(before.projection, after.projection)) {
             commands.push({command: operations.setProjection, args: [after.projection]});
         }
+        if (!isEqual(before.lights, after.lights)) {
+            commands.push({command: operations.setLights, args: [after.lights]});
+        }
+        if (!isEqual(before.camera, after.camera)) {
+            commands.push({command: operations.setCamera, args: [after.camera]});
+        }
 
         // Handle changes to `sources`
         // If a source is to be removed, we also--before the removeSource