maplibre-gl 2.0.4 → 2.1.2

package/src/style/properties.ts

@@ -24,8 +24,8 @@ import {
 type TimePoint = number;
 
 export type CrossFaded<T> = {
-  to: T;
-  from: T;
+    to: T;
+    from: T;
 };
 
 /**
@@ -64,14 +64,14 @@ export type CrossFaded<T> = {
  * @private
  */
 export interface Property<T, R> {
-  specification: StylePropertySpecification;
-  possiblyEvaluate(
-    value: PropertyValue<T, R>,
-    parameters: EvaluationParameters,
-    canonical?: CanonicalTileID,
-    availableImages?: Array<string>
-  ): R;
-  interpolate(a: R, b: R, t: number): R;
+    specification: StylePropertySpecification;
+    possiblyEvaluate(
+        value: PropertyValue<T, R>,
+        parameters: EvaluationParameters,
+        canonical?: CanonicalTileID,
+        availableImages?: Array<string>
+    ): R;
+    interpolate(a: R, b: R, t: number): R;
 }
 
 /**
@@ -109,9 +109,9 @@ export class PropertyValue<T, R> {
     }
 
     possiblyEvaluate(
-      parameters: EvaluationParameters,
-      canonical?: CanonicalTileID,
-      availableImages?: Array<string>
+        parameters: EvaluationParameters,
+        canonical?: CanonicalTileID,
+        availableImages?: Array<string>
     ): R {
         return this.property.possiblyEvaluate(this, parameters, canonical, availableImages);
     }
@@ -120,8 +120,8 @@ export class PropertyValue<T, R> {
 // ------- Transitionable -------
 
 export type TransitionParameters = {
-  now: TimePoint;
-  transition: TransitionSpecification;
+    now: TimePoint;
+    transition: TransitionSpecification;
 };
 
 /**
@@ -248,10 +248,10 @@ class TransitioningPropertyValue<T, R> {
     end: TimePoint;
 
     constructor(property: Property<T, R>,
-                value: PropertyValue<T, R>,
-                prior: TransitioningPropertyValue<T, R>,
-                transition: TransitionSpecification,
-                now: TimePoint) {
+        value: PropertyValue<T, R>,
+        prior: TransitioningPropertyValue<T, R>,
+        transition: TransitionSpecification,
+        now: TimePoint) {
         this.property = property;
         this.value = value;
         this.begin = now + transition.delay || 0;
@@ -262,9 +262,9 @@ class TransitioningPropertyValue<T, R> {
     }
 
     possiblyEvaluate(
-      parameters: EvaluationParameters,
-      canonical: CanonicalTileID,
-      availableImages: Array<string>
+        parameters: EvaluationParameters,
+        canonical: CanonicalTileID,
+        availableImages: Array<string>
     ): R {
         const now = parameters.now || 0;
         const finalValue = this.value.possiblyEvaluate(parameters, canonical, availableImages);
@@ -310,9 +310,9 @@ export class Transitioning<Props> {
     }
 
     possiblyEvaluate(
-      parameters: EvaluationParameters,
-      canonical?: CanonicalTileID,
-      availableImages?: Array<string>
+        parameters: EvaluationParameters,
+        canonical?: CanonicalTileID,
+        availableImages?: Array<string>
     ): PossiblyEvaluated<Props, any> {
         const result = new PossiblyEvaluated(this._properties); // eslint-disable-line no-use-before-define
         for (const property of Object.keys(this._values)) {
@@ -373,9 +373,9 @@ export class Layout<Props> {
     }
 
     possiblyEvaluate(
-      parameters: EvaluationParameters,
-      canonical?: CanonicalTileID,
-      availableImages?: Array<string>
+        parameters: EvaluationParameters,
+        canonical?: CanonicalTileID,
+        availableImages?: Array<string>
     ): PossiblyEvaluated<Props, any> {
         const result = new PossiblyEvaluated(this._properties); // eslint-disable-line no-use-before-define
         for (const property of Object.keys(this._values)) {
@@ -409,8 +409,8 @@ export class Layout<Props> {
  * @private
  */
 type PossiblyEvaluatedValue<T> = {
-  kind: 'constant';
-  value: T;
+    kind: 'constant';
+    value: T;
 } | SourceExpression | CompositeExpression;
 
 /**
@@ -445,10 +445,10 @@ export class PossiblyEvaluatedPropertyValue<T> {
     }
 
     evaluate(
-      feature: Feature,
-      featureState: FeatureState,
-      canonical?: CanonicalTileID,
-      availableImages?: Array<string>
+        feature: Feature,
+        featureState: FeatureState,
+        canonical?: CanonicalTileID,
+        availableImages?: Array<string>
     ): T {
         return this.property.evaluate(this.value, this.parameters, feature, featureState, canonical, availableImages);
     }
@@ -519,10 +519,10 @@ export class DataDrivenProperty<T> implements Property<T, PossiblyEvaluatedPrope
     }
 
     possiblyEvaluate(
-      value: PropertyValue<T, PossiblyEvaluatedPropertyValue<T>>,
-      parameters: EvaluationParameters,
-      canonical?: CanonicalTileID,
-      availableImages?: Array<string>
+        value: PropertyValue<T, PossiblyEvaluatedPropertyValue<T>>,
+        parameters: EvaluationParameters,
+        canonical?: CanonicalTileID,
+        availableImages?: Array<string>
     ): PossiblyEvaluatedPropertyValue<T> {
         if (value.expression.kind === 'constant' || value.expression.kind === 'camera') {
             return new PossiblyEvaluatedPropertyValue(this, {kind: 'constant', value: value.expression.evaluate(parameters, null, {}, canonical, availableImages)}, parameters);
@@ -532,9 +532,9 @@ export class DataDrivenProperty<T> implements Property<T, PossiblyEvaluatedPrope
     }
 
     interpolate(
-      a: PossiblyEvaluatedPropertyValue<T>,
-      b: PossiblyEvaluatedPropertyValue<T>,
-      t: number
+        a: PossiblyEvaluatedPropertyValue<T>,
+        b: PossiblyEvaluatedPropertyValue<T>,
+        t: number
     ): PossiblyEvaluatedPropertyValue<T> {
         // If either possibly-evaluated value is non-constant, give up: we aren't able to interpolate data-driven values.
         if (a.value.kind !== 'constant' || b.value.kind !== 'constant') {
@@ -561,12 +561,12 @@ export class DataDrivenProperty<T> implements Property<T, PossiblyEvaluatedPrope
     }
 
     evaluate(
-      value: PossiblyEvaluatedValue<T>,
-      parameters: EvaluationParameters,
-      feature: Feature,
-      featureState: FeatureState,
-      canonical?: CanonicalTileID,
-      availableImages?: Array<string>
+        value: PossiblyEvaluatedValue<T>,
+        parameters: EvaluationParameters,
+        feature: Feature,
+        featureState: FeatureState,
+        canonical?: CanonicalTileID,
+        availableImages?: Array<string>
     ): T {
         if (value.kind === 'constant') {
             return value.value;
@@ -586,10 +586,10 @@ export class DataDrivenProperty<T> implements Property<T, PossiblyEvaluatedPrope
 export class CrossFadedDataDrivenProperty<T> extends DataDrivenProperty<CrossFaded<T>> {
 
     possiblyEvaluate(
-      value: PropertyValue<CrossFaded<T>, PossiblyEvaluatedPropertyValue<CrossFaded<T>>>,
-      parameters: EvaluationParameters,
-      canonical?: CanonicalTileID,
-      availableImages?: Array<string>
+        value: PropertyValue<CrossFaded<T>, PossiblyEvaluatedPropertyValue<CrossFaded<T>>>,
+        parameters: EvaluationParameters,
+        canonical?: CanonicalTileID,
+        availableImages?: Array<string>
     ): PossiblyEvaluatedPropertyValue<CrossFaded<T>> {
         if (value.value === undefined) {
             return new PossiblyEvaluatedPropertyValue(this, {kind: 'constant', value: undefined}, parameters);
@@ -601,10 +601,10 @@ export class CrossFadedDataDrivenProperty<T> extends DataDrivenProperty<CrossFad
             return new PossiblyEvaluatedPropertyValue(this, {kind: 'constant', value: constant}, parameters);
         } else if (value.expression.kind === 'camera') {
             const cameraVal = this._calculate(
-                    value.expression.evaluate({zoom: parameters.zoom - 1.0}),
-                    value.expression.evaluate({zoom: parameters.zoom}),
-                    value.expression.evaluate({zoom: parameters.zoom + 1.0}),
-                    parameters);
+                value.expression.evaluate({zoom: parameters.zoom - 1.0}),
+                value.expression.evaluate({zoom: parameters.zoom}),
+                value.expression.evaluate({zoom: parameters.zoom + 1.0}),
+                parameters);
             return new PossiblyEvaluatedPropertyValue(this, {kind: 'constant', value: cameraVal}, parameters);
         } else {
             // source or composite expression
@@ -613,12 +613,12 @@ export class CrossFadedDataDrivenProperty<T> extends DataDrivenProperty<CrossFad
     }
 
     evaluate(
-      value: PossiblyEvaluatedValue<CrossFaded<T>>,
-      globals: EvaluationParameters,
-      feature: Feature,
-      featureState: FeatureState,
-      canonical?: CanonicalTileID,
-      availableImages?: Array<string>
+        value: PossiblyEvaluatedValue<CrossFaded<T>>,
+        globals: EvaluationParameters,
+        feature: Feature,
+        featureState: FeatureState,
+        canonical?: CanonicalTileID,
+        availableImages?: Array<string>
     ): CrossFaded<T> {
         if (value.kind === 'source') {
             const constant = value.evaluate(globals, feature, featureState, canonical, availableImages);
@@ -657,10 +657,10 @@ export class CrossFadedProperty<T> implements Property<T, CrossFaded<T>> {
     }
 
     possiblyEvaluate(
-      value: PropertyValue<T, CrossFaded<T>>,
-      parameters: EvaluationParameters,
-      canonical?: CanonicalTileID,
-      availableImages?: Array<string>
+        value: PropertyValue<T, CrossFaded<T>>,
+        parameters: EvaluationParameters,
+        canonical?: CanonicalTileID,
+        availableImages?: Array<string>
     ): CrossFaded<T> {
         if (value.value === undefined) {
             return undefined;
@@ -703,10 +703,10 @@ export class ColorRampProperty implements Property<Color, boolean> {
     }
 
     possiblyEvaluate(
-      value: PropertyValue<Color, boolean>,
-      parameters: EvaluationParameters,
-      canonical?: CanonicalTileID,
-      availableImages?: Array<string>
+        value: PropertyValue<Color, boolean>,
+        parameters: EvaluationParameters,
+        canonical?: CanonicalTileID,
+        availableImages?: Array<string>
     ): boolean {
         return !!value.expression.evaluate(parameters, null, {}, canonical, availableImages);
     }
@@ -730,7 +730,7 @@ export class Properties<Props> {
     defaultPropertyValues: {[K in keyof Props]: PropertyValue<unknown, any>};
     defaultTransitionablePropertyValues: {[K in keyof Props]: TransitionablePropertyValue<unknown, unknown>};
     defaultTransitioningPropertyValues: {[K in keyof Props]: TransitioningPropertyValue<unknown, unknown>};
-    defaultPossiblyEvaluatedValues: {[K in keyof Props]: PossiblyEvaluatedPropertyValue<unknown>};;
+    defaultPossiblyEvaluatedValues: {[K in keyof Props]: PossiblyEvaluatedPropertyValue<unknown>};
     overridableProperties: Array<string>;
 
     constructor(properties: Props) {

package/src/style/query_utils.ts

@@ -6,9 +6,9 @@ import type CircleBucket from '../data/bucket/circle_bucket';
 import type LineBucket from '../data/bucket/line_bucket';
 
 export function getMaximumPaintValue(
-  property: string,
-  layer: StyleLayer,
-  bucket: CircleBucket<any> | LineBucket
+    property: string,
+    layer: StyleLayer,
+    bucket: CircleBucket<any> | LineBucket
 ): number {
     const value = ((layer.paint as any).get(property) as PossiblyEvaluatedPropertyValue<any>).value;
     if (value.kind === 'constant') {
@@ -23,10 +23,10 @@ export function translateDistance(translate: [number, number]) {
 }
 
 export function translate(queryGeometry: Array<Point>,
-                   translate: [number, number],
-                   translateAnchor: 'viewport' | 'map',
-                   bearing: number,
-                   pixelsToTileUnits: number) {
+    translate: [number, number],
+    translateAnchor: 'viewport' | 'map',
+    bearing: number,
+    pixelsToTileUnits: number) {
     if (!translate[0] && !translate[1]) {
         return queryGeometry;
     }

package/src/style/style.test.ts

@@ -12,7 +12,7 @@ import {
 } from '../source/rtl_text_plugin';
 import browser from '../util/browser';
 import {OverscaledTileID} from '../source/tile_id';
-import {useFakeXMLHttpRequest, fakeServer} from 'sinon';
+import {fakeXhr, fakeServer} from 'nise';
 import {WorkerGlobalScopeInterface} from '../util/web_worker';
 import EvaluationParameters from './evaluation_parameters';
 import {LayerSpecification, GeoJSONSourceSpecification, FilterSpecification, SourceSpecification} from '../style-spec/types';
@@ -48,6 +48,7 @@ function createGeoJSONSource() {
 }
 
 class StubMap extends Evented {
+    style: Style;
     transform: Transform;
     private _requestManager: RequestManager;
 
@@ -60,10 +61,20 @@ class StubMap extends Evented {
     _getMapId() {
         return 1;
     }
+
+    getPixelRatio() {
+        return 1;
+    }
 }
 
 const getStubMap = () => new StubMap() as any;
 
+function createStyle(map = getStubMap()) {
+    const style = new Style(map);
+    map.style = style;
+    return style;
+}
+
 let sinonFakeXMLServer;
 let sinonFakeServer;
 let _self;
@@ -72,7 +83,7 @@ let mockConsoleError;
 beforeEach(() => {
     global.fetch = null;
     sinonFakeServer = fakeServer.create();
-    sinonFakeXMLServer = useFakeXMLHttpRequest();
+    sinonFakeXMLServer = fakeXhr.useFakeXMLHttpRequest();
 
     _self = {
         addEventListener() {}
@@ -254,7 +265,7 @@ describe('Style#loadJSON', () => {
     });
 
     test('creates sources', done => {
-        const style = new Style(getStubMap());
+        const style = createStyle();
 
         style.on('style.load', () => {
             expect(style.sourceCaches['mapLibre'] instanceof SourceCache).toBeTruthy();
@@ -272,7 +283,7 @@ describe('Style#loadJSON', () => {
     });
 
     test('creates layers', done => {
-        const style = new Style(getStubMap());
+        const style = createStyle();
 
         style.on('style.load', () => {
             expect(style.getLayer('fill') instanceof StyleLayer).toBeTruthy();
@@ -298,7 +309,7 @@ describe('Style#loadJSON', () => {
     test('transforms sprite json and image URLs before request', done => {
         const map = getStubMap();
         const transformSpy = jest.spyOn(map._requestManager, 'transformRequest');
-        const style = new Style(map);
+        const style = createStyle(map);
 
         style.on('style.load', () => {
             expect(transformSpy).toHaveBeenCalledTimes(2);
@@ -315,7 +326,7 @@ describe('Style#loadJSON', () => {
     });
 
     test('emits an error on non-existant vector source layer', done => {
-        const style = new Style(getStubMap());
+        const style = createStyle();
         style.loadJSON(createStyleJSON({
             sources: {
                 '-source-id-': {type: 'vector', tiles: []}
@@ -403,7 +414,7 @@ describe('Style#_remove', () => {
 
 describe('Style#update', () => {
     test('on error', done => {
-        const style = new Style(getStubMap());
+        const style = createStyle();
         style.loadJSON({
             'version': 8,
             'sources': {
@@ -445,7 +456,7 @@ describe('Style#setState', () => {
     });
 
     test('do nothing if there are no changes', done => {
-        const style = new Style(getStubMap());
+        const style = createStyle();
         style.loadJSON(createStyleJSON());
         jest.spyOn(style, 'addLayer').mockImplementation(() => done('test failed'));
         jest.spyOn(style, 'removeLayer').mockImplementation(() => done('test failed'));
@@ -570,7 +581,7 @@ describe('Style#addSource', () => {
     });
 
     test('fires "data" event', done => {
-        const style = new Style(getStubMap());
+        const style = createStyle();
         style.loadJSON(createStyleJSON());
         const source = createSource();
         style.once('data', () => { done(); });
@@ -581,7 +592,7 @@ describe('Style#addSource', () => {
     });
 
     test('throws on duplicates', done => {
-        const style = new Style(getStubMap());
+        const style = createStyle();
         style.loadJSON(createStyleJSON());
         const source = createSource();
         style.on('style.load', () => {
@@ -603,7 +614,7 @@ describe('Style#addSource', () => {
                 done();
             }
         };
-        const style = new Style(getStubMap());
+        const style = createStyle();
         style.loadJSON(createStyleJSON({
             layers: [{
                 id: 'background',
@@ -791,7 +802,7 @@ describe('Style#addLayer', () => {
     });
 
     test('throws on non-existant vector source layer', done => {
-        const style = new Style(getStubMap());
+        const style = createStyle();
         style.loadJSON(createStyleJSON({
             sources: {
                 // At least one source must be added to trigger the load event
@@ -860,7 +871,7 @@ describe('Style#addLayer', () => {
     });
 
     test('reloads source', done => {
-        const style = new Style(getStubMap());
+        const style = createStyle();
         style.loadJSON(extend(createStyleJSON(), {
             'sources': {
                 'mapLibre': {
@@ -887,7 +898,7 @@ describe('Style#addLayer', () => {
     });
 
     test('#3895 reloads source (instead of clearing) if adding this layer with the same type, immediately after removing it', done => {
-        const style = new Style(getStubMap());
+        const style = createStyle();
         style.loadJSON(extend(createStyleJSON(), {
             'sources': {
                 'mapLibre': {
@@ -924,7 +935,7 @@ describe('Style#addLayer', () => {
     });
 
     test('clears source (instead of reloading) if adding this layer with a different type, immediately after removing it', done => {
-        const style = new Style(getStubMap());
+        const style = createStyle();
         style.loadJSON(extend(createStyleJSON(), {
             'sources': {
                 'mapLibre': {

package/src/style/style.ts

@@ -37,8 +37,8 @@ import {validateCustomStyleLayer} from './style_layer/custom_style_layer';
 // to continue to allow canvas sources to be added at runtime/updated in
 // smart setStyle (see https://github.com/mapbox/mapbox-gl-js/pull/6424):
 const emitValidationErrors = (evented: Evented, errors?: ReadonlyArray<{
-  message: string;
-  identifier?: string;
+    message: string;
+    identifier?: string;
 }> | null) =>
     _emitValidationErrors(evented, errors && errors.filter(error => error.identifier !== 'source.canvas'));
 
@@ -88,12 +88,12 @@ const ignoredDiffOperations = pick(diffOperations, [
 const empty = emptyStyle() as StyleSpecification;
 
 export type StyleOptions = {
-  validate?: boolean;
-  localIdeographFontFamily?: string;
+    validate?: boolean;
+    localIdeographFontFamily?: string;
 };
 
 export type StyleSetterOptions = {
-  validate?: boolean;
+    validate?: boolean;
 };
 /**
  * @private
@@ -203,7 +203,7 @@ class Style extends Evented {
     }
 
     loadURL(url: string, options: {
-      validate?: boolean;
+        validate?: boolean;
     } = {}) {
         this.fire(new Event('dataloading', {dataType: 'style'}));
 
@@ -276,7 +276,7 @@ class Style extends Evented {
     }
 
     _loadSprite(url: string) {
-        this._spriteRequest = loadSprite(url, this.map._requestManager, (err, images) => {
+        this._spriteRequest = loadSprite(url, this.map._requestManager, this.map.getPixelRatio(), (err, images) => {
             this._spriteRequest = null;
             if (err) {
                 this.fire(new ErrorEvent(err));
@@ -611,10 +611,10 @@ class Style extends Evented {
     }
 
     /**
-    * Set the data of a GeoJSON source, given its id.
-    * @param {string} id id of the source
-    * @param {GeoJSON|string} data GeoJSON source
-    */
+     * Set the data of a GeoJSON source, given its id.
+     * @param {string} id id of the source
+     * @param {GeoJSON|string} data GeoJSON source
+     */
     setGeoJSONSourceData(id: string, data: GeoJSON.GeoJSON | string) {
         this._checkLoaded();
 
@@ -716,7 +716,7 @@ class Style extends Evented {
     /**
      * Moves a layer to a different z-position. The layer will be inserted before the layer with
      * ID `before`, or appended if `before` is omitted.
-     * @param {string} id  ID of the layer to move
+     * @param {string} id ID of the layer to move
      * @param {string} [before] ID of an existing layer to insert before
      */
     moveLayer(id: string, before?: string) {
@@ -913,9 +913,9 @@ class Style extends Evented {
     }
 
     setFeatureState(target: {
-      source: string;
-      sourceLayer?: string;
-      id: string | number;
+        source: string;
+        sourceLayer?: string;
+        id: string | number;
     }, state: any) {
         this._checkLoaded();
         const sourceId = target.source;
@@ -943,9 +943,9 @@ class Style extends Evented {
     }
 
     removeFeatureState(target: {
-      source: string;
-      sourceLayer?: string;
-      id?: string | number;
+        source: string;
+        sourceLayer?: string;
+        id?: string | number;
     }, key?: string) {
         this._checkLoaded();
         const sourceId = target.source;
@@ -973,9 +973,9 @@ class Style extends Evented {
     }
 
     getFeatureState(target: {
-      source: string;
-      sourceLayer?: string;
-      id: string | number;
+        source: string;
+        sourceLayer?: string;
+        id: string | number;
     }) {
         this._checkLoaded();
         const sourceId = target.source;
@@ -1218,7 +1218,7 @@ class Style extends Evented {
     }
 
     _validate(validate: Validator, key: string, value: any, props: any, options: {
-      validate?: boolean;
+        validate?: boolean;
     } = {}) {
         if (options && options.validate === false) {
             return false;
@@ -1354,14 +1354,14 @@ class Style extends Evented {
     // Callbacks from web workers
 
     getImages(
-      mapId: string,
-      params: {
-        icons: Array<string>;
-        source: string;
-        tileID: OverscaledTileID;
-        type: string;
-      },
-      callback: Callback<{[_: string]: StyleImage}>
+        mapId: string,
+        params: {
+            icons: Array<string>;
+            source: string;
+            tileID: OverscaledTileID;
+            type: string;
+        },
+        callback: Callback<{[_: string]: StyleImage}>
     ) {
         this.imageManager.getImages(params.icons, callback);
 

package/src/style/style_glyph.ts

@@ -1,15 +1,15 @@
 import type {AlphaImage} from '../util/image';
 
 export type GlyphMetrics = {
-  width: number;
-  height: number;
-  left: number;
-  top: number;
-  advance: number;
+    width: number;
+    height: number;
+    left: number;
+    top: number;
+    advance: number;
 };
 
 export type StyleGlyph = {
-  id: number;
-  bitmap: AlphaImage;
-  metrics: GlyphMetrics;
+    id: number;
+    bitmap: AlphaImage;
+    metrics: GlyphMetrics;
 };