maplibre-gl 2.0.4 → 2.1.2

package/src/render/program/fill_extrusion_program.ts

@@ -18,29 +18,29 @@ import type {CrossfadeParameters} from '../../style/evaluation_parameters';
 import type Tile from '../../source/tile';
 
 export type FillExtrusionUniformsType = {
-  'u_matrix': UniformMatrix4f;
-  'u_lightpos': Uniform3f;
-  'u_lightintensity': Uniform1f;
-  'u_lightcolor': Uniform3f;
-  'u_vertical_gradient': Uniform1f;
-  'u_opacity': Uniform1f;
+    'u_matrix': UniformMatrix4f;
+    'u_lightpos': Uniform3f;
+    'u_lightintensity': Uniform1f;
+    'u_lightcolor': Uniform3f;
+    'u_vertical_gradient': Uniform1f;
+    'u_opacity': Uniform1f;
 };
 
 export type FillExtrusionPatternUniformsType = {
-  'u_matrix': UniformMatrix4f;
-  'u_lightpos': Uniform3f;
-  'u_lightintensity': Uniform1f;
-  'u_lightcolor': Uniform3f;
-  'u_height_factor': Uniform1f;
-  'u_vertical_gradient': Uniform1f;
-  // pattern uniforms:
-  'u_texsize': Uniform2f;
-  'u_image': Uniform1i;
-  'u_pixel_coord_upper': Uniform2f;
-  'u_pixel_coord_lower': Uniform2f;
-  'u_scale': Uniform3f;
-  'u_fade': Uniform1f;
-  'u_opacity': Uniform1f;
+    'u_matrix': UniformMatrix4f;
+    'u_lightpos': Uniform3f;
+    'u_lightintensity': Uniform1f;
+    'u_lightcolor': Uniform3f;
+    'u_height_factor': Uniform1f;
+    'u_vertical_gradient': Uniform1f;
+    // pattern uniforms:
+    'u_texsize': Uniform2f;
+    'u_image': Uniform1i;
+    'u_pixel_coord_upper': Uniform2f;
+    'u_pixel_coord_lower': Uniform2f;
+    'u_scale': Uniform3f;
+    'u_fade': Uniform1f;
+    'u_opacity': Uniform1f;
 };
 
 const fillExtrusionUniforms = (context: Context, locations: UniformLocations): FillExtrusionUniformsType => ({
@@ -70,10 +70,10 @@ const fillExtrusionPatternUniforms = (context: Context, locations: UniformLocati
 });
 
 const fillExtrusionUniformValues = (
-  matrix: mat4,
-  painter: Painter,
-  shouldUseVerticalGradient: boolean,
-  opacity: number
+    matrix: mat4,
+    painter: Painter,
+    shouldUseVerticalGradient: boolean,
+    opacity: number
 ): UniformValues<FillExtrusionUniformsType> => {
     const light = painter.style.light;
     const _lp = light.properties.get('position');
@@ -97,13 +97,13 @@ const fillExtrusionUniformValues = (
 };
 
 const fillExtrusionPatternUniformValues = (
-  matrix: mat4,
-  painter: Painter,
-  shouldUseVerticalGradient: boolean,
-  opacity: number,
-  coord: OverscaledTileID,
-  crossfade: CrossfadeParameters,
-  tile: Tile
+    matrix: mat4,
+    painter: Painter,
+    shouldUseVerticalGradient: boolean,
+    opacity: number,
+    coord: OverscaledTileID,
+    crossfade: CrossfadeParameters,
+    tile: Tile
 ): UniformValues<FillExtrusionPatternUniformsType> => {
     return extend(fillExtrusionUniformValues(matrix, painter, shouldUseVerticalGradient, opacity),
         patternUniformValues(crossfade, painter, tile),

package/src/render/program/fill_program.ts

@@ -16,35 +16,35 @@ import type Tile from '../../source/tile';
 import {mat4} from 'gl-matrix';
 
 export type FillUniformsType = {
-  'u_matrix': UniformMatrix4f;
+    'u_matrix': UniformMatrix4f;
 };
 
 export type FillOutlineUniformsType = {
-  'u_matrix': UniformMatrix4f;
-  'u_world': Uniform2f;
+    'u_matrix': UniformMatrix4f;
+    'u_world': Uniform2f;
 };
 
 export type FillPatternUniformsType = {
-  'u_matrix': UniformMatrix4f;
-  // pattern uniforms:
-  'u_texsize': Uniform2f;
-  'u_image': Uniform1i;
-  'u_pixel_coord_upper': Uniform2f;
-  'u_pixel_coord_lower': Uniform2f;
-  'u_scale': Uniform3f;
-  'u_fade': Uniform1f;
+    'u_matrix': UniformMatrix4f;
+    // pattern uniforms:
+    'u_texsize': Uniform2f;
+    'u_image': Uniform1i;
+    'u_pixel_coord_upper': Uniform2f;
+    'u_pixel_coord_lower': Uniform2f;
+    'u_scale': Uniform3f;
+    'u_fade': Uniform1f;
 };
 
 export type FillOutlinePatternUniformsType = {
-  'u_matrix': UniformMatrix4f;
-  'u_world': Uniform2f;
-  // pattern uniforms:
-  'u_texsize': Uniform2f;
-  'u_image': Uniform1i;
-  'u_pixel_coord_upper': Uniform2f;
-  'u_pixel_coord_lower': Uniform2f;
-  'u_scale': Uniform3f;
-  'u_fade': Uniform1f;
+    'u_matrix': UniformMatrix4f;
+    'u_world': Uniform2f;
+    // pattern uniforms:
+    'u_texsize': Uniform2f;
+    'u_image': Uniform1i;
+    'u_pixel_coord_upper': Uniform2f;
+    'u_pixel_coord_lower': Uniform2f;
+    'u_scale': Uniform3f;
+    'u_fade': Uniform1f;
 };
 
 const fillUniforms = (context: Context, locations: UniformLocations): FillUniformsType => ({
@@ -82,10 +82,10 @@ const fillUniformValues = (matrix: mat4): UniformValues<FillUniformsType> => ({
 });
 
 const fillPatternUniformValues = (
-  matrix: mat4,
-  painter: Painter,
-  crossfade: CrossfadeParameters,
-  tile: Tile
+    matrix: mat4,
+    painter: Painter,
+    crossfade: CrossfadeParameters,
+    tile: Tile
 ): UniformValues<FillPatternUniformsType> => extend(
     fillUniformValues(matrix),
     patternUniformValues(crossfade, painter, tile)
@@ -97,11 +97,11 @@ const fillOutlineUniformValues = (matrix: mat4, drawingBufferSize: [number, numb
 });
 
 const fillOutlinePatternUniformValues = (
-  matrix: mat4,
-  painter: Painter,
-  crossfade: CrossfadeParameters,
-  tile: Tile,
-  drawingBufferSize: [number, number]
+    matrix: mat4,
+    painter: Painter,
+    crossfade: CrossfadeParameters,
+    tile: Tile,
+    drawingBufferSize: [number, number]
 ): UniformValues<FillOutlinePatternUniformsType> => extend(
     fillPatternUniformValues(matrix, painter, crossfade, tile),
     {

package/src/render/program/heatmap_program.ts

@@ -15,17 +15,17 @@ import type Painter from '../painter';
 import type HeatmapStyleLayer from '../../style/style_layer/heatmap_style_layer';
 
 export type HeatmapUniformsType = {
-  'u_extrude_scale': Uniform1f;
-  'u_intensity': Uniform1f;
-  'u_matrix': UniformMatrix4f;
+    'u_extrude_scale': Uniform1f;
+    'u_intensity': Uniform1f;
+    'u_matrix': UniformMatrix4f;
 };
 
 export type HeatmapTextureUniformsType = {
-  'u_matrix': UniformMatrix4f;
-  'u_world': Uniform2f;
-  'u_image': Uniform1i;
-  'u_color_ramp': Uniform1i;
-  'u_opacity': Uniform1f;
+    'u_matrix': UniformMatrix4f;
+    'u_world': Uniform2f;
+    'u_image': Uniform1i;
+    'u_color_ramp': Uniform1i;
+    'u_opacity': Uniform1f;
 };
 
 const heatmapUniforms = (context: Context, locations: UniformLocations): HeatmapUniformsType => ({
@@ -49,10 +49,10 @@ const heatmapUniformValues = (matrix: mat4, tile: Tile, zoom: number, intensity:
 });
 
 const heatmapTextureUniformValues = (
-  painter: Painter,
-  layer: HeatmapStyleLayer,
-  textureUnit: number,
-  colorRampUnit: number
+    painter: Painter,
+    layer: HeatmapStyleLayer,
+    textureUnit: number,
+    colorRampUnit: number
 ): UniformValues<HeatmapTextureUniformsType> => {
     const matrix = mat4.create();
     mat4.ortho(matrix, 0, painter.width, painter.height, 0, 0, 1);

package/src/render/program/hillshade_program.ts

@@ -20,21 +20,21 @@ import type DEMData from '../../data/dem_data';
 import type {OverscaledTileID} from '../../source/tile_id';
 
 export type HillshadeUniformsType = {
-  'u_matrix': UniformMatrix4f;
-  'u_image': Uniform1i;
-  'u_latrange': Uniform2f;
-  'u_light': Uniform2f;
-  'u_shadow': UniformColor;
-  'u_highlight': UniformColor;
-  'u_accent': UniformColor;
+    'u_matrix': UniformMatrix4f;
+    'u_image': Uniform1i;
+    'u_latrange': Uniform2f;
+    'u_light': Uniform2f;
+    'u_shadow': UniformColor;
+    'u_highlight': UniformColor;
+    'u_accent': UniformColor;
 };
 
 export type HillshadePrepareUniformsType = {
-  'u_matrix': UniformMatrix4f;
-  'u_image': Uniform1i;
-  'u_dimension': Uniform2f;
-  'u_zoom': Uniform1f;
-  'u_unpack': Uniform4f;
+    'u_matrix': UniformMatrix4f;
+    'u_image': Uniform1i;
+    'u_dimension': Uniform2f;
+    'u_zoom': Uniform1f;
+    'u_unpack': Uniform4f;
 };
 
 const hillshadeUniforms = (context: Context, locations: UniformLocations): HillshadeUniformsType => ({

package/src/render/program/line_program.ts

@@ -12,44 +12,44 @@ import type Painter from '../painter';
 import type {CrossfadeParameters} from '../../style/evaluation_parameters';
 
 export type LineUniformsType = {
-  'u_matrix': UniformMatrix4f;
-  'u_ratio': Uniform1f;
-  'u_device_pixel_ratio': Uniform1f;
-  'u_units_to_pixels': Uniform2f;
+    'u_matrix': UniformMatrix4f;
+    'u_ratio': Uniform1f;
+    'u_device_pixel_ratio': Uniform1f;
+    'u_units_to_pixels': Uniform2f;
 };
 
 export type LineGradientUniformsType = {
-  'u_matrix': UniformMatrix4f;
-  'u_ratio': Uniform1f;
-  'u_device_pixel_ratio': Uniform1f;
-  'u_units_to_pixels': Uniform2f;
-  'u_image': Uniform1i;
-  'u_image_height': Uniform1f;
+    'u_matrix': UniformMatrix4f;
+    'u_ratio': Uniform1f;
+    'u_device_pixel_ratio': Uniform1f;
+    'u_units_to_pixels': Uniform2f;
+    'u_image': Uniform1i;
+    'u_image_height': Uniform1f;
 };
 
 export type LinePatternUniformsType = {
-  'u_matrix': UniformMatrix4f;
-  'u_texsize': Uniform2f;
-  'u_ratio': Uniform1f;
-  'u_device_pixel_ratio': Uniform1f;
-  'u_units_to_pixels': Uniform2f;
-  'u_image': Uniform1i;
-  'u_scale': Uniform3f;
-  'u_fade': Uniform1f;
+    'u_matrix': UniformMatrix4f;
+    'u_texsize': Uniform2f;
+    'u_ratio': Uniform1f;
+    'u_device_pixel_ratio': Uniform1f;
+    'u_units_to_pixels': Uniform2f;
+    'u_image': Uniform1i;
+    'u_scale': Uniform3f;
+    'u_fade': Uniform1f;
 };
 
 export type LineSDFUniformsType = {
-  'u_matrix': UniformMatrix4f;
-  'u_ratio': Uniform1f;
-  'u_device_pixel_ratio': Uniform1f;
-  'u_units_to_pixels': Uniform2f;
-  'u_patternscale_a': Uniform2f;
-  'u_patternscale_b': Uniform2f;
-  'u_sdfgamma': Uniform1f;
-  'u_image': Uniform1i;
-  'u_tex_y_a': Uniform1f;
-  'u_tex_y_b': Uniform1f;
-  'u_mix': Uniform1f;
+    'u_matrix': UniformMatrix4f;
+    'u_ratio': Uniform1f;
+    'u_device_pixel_ratio': Uniform1f;
+    'u_units_to_pixels': Uniform2f;
+    'u_patternscale_a': Uniform2f;
+    'u_patternscale_b': Uniform2f;
+    'u_sdfgamma': Uniform1f;
+    'u_image': Uniform1i;
+    'u_tex_y_a': Uniform1f;
+    'u_tex_y_b': Uniform1f;
+    'u_mix': Uniform1f;
 };
 
 const lineUniforms = (context: Context, locations: UniformLocations): LineUniformsType => ({
@@ -99,7 +99,7 @@ const lineUniformValues = (painter: Painter, tile: Tile, layer: LineStyleLayer):
     return {
         'u_matrix': calculateMatrix(painter, tile, layer),
         'u_ratio': 1 / pixelsToTileUnits(tile, 1, transform.zoom),
-        'u_device_pixel_ratio': devicePixelRatio,
+        'u_device_pixel_ratio': painter.pixelRatio,
         'u_units_to_pixels': [
             1 / transform.pixelsToGLUnits[0],
             1 / transform.pixelsToGLUnits[1]
@@ -115,10 +115,10 @@ const lineGradientUniformValues = (painter: Painter, tile: Tile, layer: LineStyl
 };
 
 const linePatternUniformValues = (
-  painter: Painter,
-  tile: Tile,
-  layer: LineStyleLayer,
-  crossfade: CrossfadeParameters
+    painter: Painter,
+    tile: Tile,
+    layer: LineStyleLayer,
+    crossfade: CrossfadeParameters
 ): UniformValues<LinePatternUniformsType> => {
     const transform = painter.transform;
     const tileZoomRatio = calculateTileRatio(tile, transform);
@@ -127,7 +127,7 @@ const linePatternUniformValues = (
         'u_texsize': tile.imageAtlasTexture.size,
         // camera zoom ratio
         'u_ratio': 1 / pixelsToTileUnits(tile, 1, transform.zoom),
-        'u_device_pixel_ratio': devicePixelRatio,
+        'u_device_pixel_ratio': painter.pixelRatio,
         'u_image': 0,
         'u_scale': [tileZoomRatio, crossfade.fromScale, crossfade.toScale],
         'u_fade': crossfade.t,
@@ -139,11 +139,11 @@ const linePatternUniformValues = (
 };
 
 const lineSDFUniformValues = (
-  painter: Painter,
-  tile: Tile,
-  layer: LineStyleLayer,
-  dasharray: CrossFaded<Array<number>>,
-  crossfade: CrossfadeParameters
+    painter: Painter,
+    tile: Tile,
+    layer: LineStyleLayer,
+    dasharray: CrossFaded<Array<number>>,
+    crossfade: CrossfadeParameters
 ): UniformValues<LineSDFUniformsType> => {
     const transform = painter.transform;
     const lineAtlas = painter.lineAtlas;
@@ -160,7 +160,7 @@ const lineSDFUniformValues = (
     return extend(lineUniformValues(painter, tile, layer), {
         'u_patternscale_a': [tileRatio / widthA, -posA.height / 2],
         'u_patternscale_b': [tileRatio / widthB, -posB.height / 2],
-        'u_sdfgamma': lineAtlas.width / (Math.min(widthA, widthB) * 256 * devicePixelRatio) / 2,
+        'u_sdfgamma': lineAtlas.width / (Math.min(widthA, widthB) * 256 * painter.pixelRatio) / 2,
         'u_image': 0,
         'u_tex_y_a': posA.y,
         'u_tex_y_b': posB.y,

package/src/render/program/pattern.ts

@@ -16,30 +16,30 @@ import type Tile from '../../source/tile';
 import type ResolvedImage from '../../style-spec/expression/types/resolved_image';
 
 type BackgroundPatternUniformsType = {
-  'u_image': Uniform1i;
-  'u_pattern_tl_a': Uniform2f;
-  'u_pattern_br_a': Uniform2f;
-  'u_pattern_tl_b': Uniform2f;
-  'u_pattern_br_b': Uniform2f;
-  'u_texsize': Uniform2f;
-  'u_mix': Uniform1f;
-  'u_pattern_size_a': Uniform2f;
-  'u_pattern_size_b': Uniform2f;
-  'u_scale_a': Uniform1f;
-  'u_scale_b': Uniform1f;
-  'u_pixel_coord_upper': Uniform2f;
-  'u_pixel_coord_lower': Uniform2f;
-  'u_tile_units_to_pixels': Uniform1f;
+    'u_image': Uniform1i;
+    'u_pattern_tl_a': Uniform2f;
+    'u_pattern_br_a': Uniform2f;
+    'u_pattern_tl_b': Uniform2f;
+    'u_pattern_br_b': Uniform2f;
+    'u_texsize': Uniform2f;
+    'u_mix': Uniform1f;
+    'u_pattern_size_a': Uniform2f;
+    'u_pattern_size_b': Uniform2f;
+    'u_scale_a': Uniform1f;
+    'u_scale_b': Uniform1f;
+    'u_pixel_coord_upper': Uniform2f;
+    'u_pixel_coord_lower': Uniform2f;
+    'u_tile_units_to_pixels': Uniform1f;
 };
 
 export type PatternUniformsType = {
-  // pattern uniforms:
-  'u_image': Uniform1i;
-  'u_texsize': Uniform2f;
-  'u_scale': Uniform3f;
-  'u_fade': Uniform1f;
-  'u_pixel_coord_upper': Uniform2f;
-  'u_pixel_coord_lower': Uniform2f;
+    // pattern uniforms:
+    'u_image': Uniform1i;
+    'u_texsize': Uniform2f;
+    'u_scale': Uniform3f;
+    'u_fade': Uniform1f;
+    'u_pixel_coord_upper': Uniform2f;
+    'u_pixel_coord_lower': Uniform2f;
 };
 
 function patternUniformValues(crossfade: CrossfadeParameters, painter: Painter, tile: Tile): UniformValues<PatternUniformsType> {
@@ -64,13 +64,13 @@ function patternUniformValues(crossfade: CrossfadeParameters, painter: Painter,
 }
 
 function bgPatternUniformValues(
-  image: CrossFaded<ResolvedImage>,
-  crossfade: CrossfadeParameters,
-  painter: Painter,
-  tile: {
-    tileID: OverscaledTileID;
-    tileSize: number;
-  }
+    image: CrossFaded<ResolvedImage>,
+    crossfade: CrossfadeParameters,
+    painter: Painter,
+    tile: {
+        tileID: OverscaledTileID;
+        tileSize: number;
+    }
 ): UniformValues<BackgroundPatternUniformsType> {
     const imagePosA = painter.imageManager.getPattern(image.from.toString());
     const imagePosB = painter.imageManager.getPattern(image.to.toString());

package/src/render/program/raster_program.ts

@@ -6,19 +6,19 @@ import type RasterStyleLayer from '../../style/style_layer/raster_style_layer';
 import {mat4} from 'gl-matrix';
 
 export type RasterUniformsType = {
-  'u_matrix': UniformMatrix4f;
-  'u_tl_parent': Uniform2f;
-  'u_scale_parent': Uniform1f;
-  'u_buffer_scale': Uniform1f;
-  'u_fade_t': Uniform1f;
-  'u_opacity': Uniform1f;
-  'u_image0': Uniform1i;
-  'u_image1': Uniform1i;
-  'u_brightness_low': Uniform1f;
-  'u_brightness_high': Uniform1f;
-  'u_saturation_factor': Uniform1f;
-  'u_contrast_factor': Uniform1f;
-  'u_spin_weights': Uniform3f;
+    'u_matrix': UniformMatrix4f;
+    'u_tl_parent': Uniform2f;
+    'u_scale_parent': Uniform1f;
+    'u_buffer_scale': Uniform1f;
+    'u_fade_t': Uniform1f;
+    'u_opacity': Uniform1f;
+    'u_image0': Uniform1i;
+    'u_image1': Uniform1i;
+    'u_brightness_low': Uniform1f;
+    'u_brightness_high': Uniform1f;
+    'u_saturation_factor': Uniform1f;
+    'u_contrast_factor': Uniform1f;
+    'u_spin_weights': Uniform3f;
 };
 
 const rasterUniforms = (context: Context, locations: UniformLocations): RasterUniformsType => ({
@@ -38,14 +38,14 @@ const rasterUniforms = (context: Context, locations: UniformLocations): RasterUn
 });
 
 const rasterUniformValues = (
-  matrix: mat4,
-  parentTL: [number, number],
-  parentScaleBy: number,
-  fade: {
-    mix: number;
-    opacity: number;
-  },
-  layer: RasterStyleLayer
+    matrix: mat4,
+    parentTL: [number, number],
+    parentScaleBy: number,
+    fade: {
+        mix: number;
+        opacity: number;
+    },
+    layer: RasterStyleLayer
 ): UniformValues<RasterUniformsType> => ({
     'u_matrix': matrix,
     'u_tl_parent': parentTL,