v3.6.0-beta.1

.circleci/config.yml

@@ -177,7 +177,7 @@ workflows:
 
 linux-defaults: &linux-defaults
   docker:
-    - image: cimg/node:18.20-browsers
+    - image: cimg/node:20.15-browsers
   working_directory: ~/mapbox-gl-js
 
 mac-defaults: &mac-defaults

.github/workflows/codeql.yml

@@ -38,6 +38,12 @@ jobs:
     - name: Checkout repository
       uses: actions/checkout@v4
 
+    - if: matrix.language == 'javascript-typescript'
+      name: Setup Node.js 20.x
+      uses: actions/setup-node@v4
+      with:
+        node-version: 20.x
+
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v2

.nvmrc

@@ -1 +1 @@
-18.20.2
+20.15.1

3d-style/render/shadow_renderer.ts

@@ -54,6 +54,7 @@ type ShadowNormalOffsetMode = 'vector-tile' | 'model-tile';
 
 const shadowParameters = {
     cascadeCount: 2,
+    normalOffset: 3,
     shadowMapResolution: 2048
 };
 
@@ -168,6 +169,7 @@ export class ShadowRenderer {
 
         painter.tp.registerParameter(this, ["Shadows"], "_forceDisable", {label: "forceDisable"}, () => { this.painter.style.map.triggerRepaint(); });
         painter.tp.registerParameter(shadowParameters, ["Shadows"], "cascadeCount", {min: 1, max: 2, step: 1});
+        painter.tp.registerParameter(shadowParameters, ["Shadows"], "normalOffset", {min: 0, max: 10, step: 0.05});
         painter.tp.registerParameter(shadowParameters, ["Shadows"], "shadowMapResolution", {min: 32, max: 2048, step: 32});
         painter.tp.registerBinding(this, ["Shadows"], "_numCascadesToRender", {readonly: true, label: 'numCascadesToRender'});
     }
@@ -500,7 +502,7 @@ export class ShadowRenderer {
         this.useNormalOffset = normalOffset;
 
         if (normalOffset) {
-            const scale = 5.0; // Experimentally found value
+            const scale = shadowParameters.normalOffset;
             uniforms["u_shadow_normal_offset"] = [1.0, scale, scale]; // meterToTile isn't used
             uniforms["u_shadow_bias"] = [0.00006, 0.0012, 0.012]; // Reduce constant offset
         } else {

3d-style/shaders/_prelude_shadow.vertex.glsl

@@ -14,7 +14,9 @@ vec3 shadow_normal_offset(vec3 normal) {
 }
 
 vec3 shadow_normal_offset_model(vec3 normal) {
-    float dotScale = min(1.0 - dot(normal, u_shadow_direction), 1.0) * 0.5 + 0.5;
+    vec3 transformed_normal = vec3(-normal.xy, normal.z);
+    float NDotL = dot(normalize(transformed_normal), u_shadow_direction);
+    float dotScale = min(1.0 - NDotL, 1.0) * 0.5 + 0.5;
     return normal * dotScale;
 }
 

3d-style/shaders/model.fragment.glsl

@@ -19,8 +19,8 @@ in highp vec4 v_position_height;
 in lowp vec4 v_color_mix;
 
 #ifdef RENDER_SHADOWS
-in vec4 v_pos_light_view_0;
-in vec4 v_pos_light_view_1;
+in highp vec4 v_pos_light_view_0;
+in highp vec4 v_pos_light_view_1;
 in float v_depth_shadows;
 #endif
 

3d-style/shaders/model.vertex.glsl

@@ -39,8 +39,8 @@ uniform highp mat4 u_normal_matrix;
 #ifdef RENDER_SHADOWS
 uniform mat4 u_light_matrix_0;
 uniform mat4 u_light_matrix_1;
-out vec4 v_pos_light_view_0;
-out vec4 v_pos_light_view_1;
+out highp vec4 v_pos_light_view_0;
+out highp vec4 v_pos_light_view_1;
 out float v_depth_shadows;
 #endif
 
@@ -181,7 +181,7 @@ void main() {
     vec3 offset = shadow_normal_offset(vec3(-normal_3f.xy, normal_3f.z));
     shadow_pos.xyz += offset * shadow_normal_offset_multiplier0();
 #else
-    vec3 offset = shadow_normal_offset_model(normalize(normal_3f));
+    vec3 offset = shadow_normal_offset_model(normal_3f);
     shadow_pos.xyz += offset * shadow_normal_offset_multiplier0();
 #endif
 #endif // HAS_ATTRIBUTE_a_normal_3f

CHANGELOG.md

@@ -1,3 +1,21 @@
+## 3.6.0-beta.1
+
+### Features and improvements ✨
+- Improve initial load performance.
+- Add inner glow effect for negative `circle-blur` values.
+- Add support for inlining TileJSON in style source definitions using `data` field.
+- Improve 3D models' shadow appearance.
+- Improve performance of updating config values of a style.
+- Add more descriptive expression evaluation error messages.
+- Improve TypeScript typings.
+
+### Bug fixes 🐞
+- Fix `isSourceLoaded` flag on `sourcedata` event for already loaded sources.
+- Fix firing `load` event when all tiles fail to load.
+- Fix performance issues when GeoJSON in `dynamic` mode is updated too frequently.
+- Fix rasterarray layer flickering from stale tiles cache.
+- Fix spikes when viewing terrain-enabled maps in certain environments.
+
 ## 3.5.2
 
 - Improve 3D models rendering performance.

CONTRIBUTING.md

@@ -9,9 +9,9 @@ Install the Xcode Command Line Tools Package
 xcode-select --install
 ```
 
-Install [node.js](https://nodejs.org/) version 18
+Install [node.js](https://nodejs.org/) version 20
 ```bash
-brew install node@18
+brew install node@20
 ```
 
 Clone the repository
@@ -26,10 +26,10 @@ npm install
 
 ### Linux
 
-Install [git](https://git-scm.com/), [node.js](https://nodejs.org/) version 18, [GNU Make](http://www.gnu.org/software/make/), and libglew-dev
+Install [git](https://git-scm.com/), [node.js](https://nodejs.org/) version 20, [GNU Make](http://www.gnu.org/software/make/), and libglew-dev
 ```bash
 sudo apt-get update
-curl -sL https://deb.nodesource.com/setup_18.x | sudo bash -
+curl -sL https://deb.nodesource.com/setup_20.x | sudo bash -
 sudo apt-get install build-essential git nodejs libglew-dev libxi-dev
 ```
 
@@ -45,7 +45,7 @@ npm install
 
 ### Windows
 
-Install [git](https://git-scm.com/), [node.js](https://nodejs.org/) version 18, [npm and node-gyp](https://github.com/Microsoft/nodejs-guidelines/blob/master/windows-environment.md#compiling-native-addon-modules).
+Install [git](https://git-scm.com/), [node.js](https://nodejs.org/) version 20, [npm and node-gyp](https://github.com/Microsoft/nodejs-guidelines/blob/master/windows-environment.md#compiling-native-addon-modules).
 
 Clone the repository
 ```bash

build/generate-typed-style-spec.ts

@@ -236,6 +236,7 @@ export type ResolvedImageSpecification = string;
 export type PromoteIdSpecification = {[_: string]: string} | string;
 
 export type FilterSpecification =
+    | ExpressionSpecification
     | ['has', string]
     | ['!has', string]
     | ['==', string, string | number | boolean]

build/publish.sh

@@ -35,9 +35,3 @@ git tag --points-at HEAD | while read tag; do
         echo "Unrecognized tag: $tag"
     fi
 done
-
-if [ -n "$(git tag --points-at HEAD)" ]; then
-    node build/generate-release-list.js &&
-    aws s3 cp --acl public-read --content-type application/json dist/versions.json s3://mapbox-gl-js/versions.json &&
-    aws s3 cp --acl public-read --content-type application/javascript dist/versions.jsonp s3://mapbox-gl-js/versions.jsonp
-fi

build/upload.sh

@@ -88,3 +88,6 @@ do
 		aws s3 cp --acl public-read --content-type ${mimetype} ./dist/${file} s3://mapbox-gl-js/${tag}/${file}
 	fi
 done
+
+aws s3 cp --acl public-read --content-type application/json dist/versions.json s3://mapbox-gl-js/versions.json &&
+aws s3 cp --acl public-read --content-type application/javascript dist/versions.jsonp s3://mapbox-gl-js/versions.jsonp

buildspec.yml

@@ -3,7 +3,7 @@ version: 0.2
 phases:
   install:
     runtime-versions:
-      nodejs: 18
+      nodejs: 20
     commands:
       - echo "//registry.npmjs.org/:_authToken=$NPMAccessToken" > ~/.npmrc
       - npm whoami

debug/circles.html

@@ -22,6 +22,7 @@
 <div id='checkboxes'>
     <label><input id='terrain-checkbox' type='checkbox' checked> terrain</label><br />
     <label><input id='globe-checkbox' type='checkbox'> globe</label><br />
+    <label><input type="range" min="-100" max="100" value="0" class="slider" id="blur-slider"> blur: </label><label id='glow'>0.0</label><br />
 </div>
 
 <script src='../dist/mapbox-gl-dev.js'></script>
@@ -101,6 +102,12 @@
     map.setProjection(this.checked ? "globe" : null);
 };
 
+document.getElementById('blur-slider').oninput = function() {
+    const glow = parseInt(this.value) / 100.0;
+    map.setPaintProperty("circles", 'circle-blur', glow);
+    document.getElementById('glow').innerHTML = glow;
+};
+
 let hovered = [];
 window.addEventListener('mousemove', function(e) {
     e.point = new mapboxgl.Point(e.clientX, e.clientY);

debug/i18n.html

@@ -153,7 +153,7 @@
 });
 
 map.addControl(new mapboxgl.ScaleControl());
-mapboxgl.setRTLTextPlugin('https://api.mapbox.com/mapbox-gl-js/plugins/mapbox-gl-rtl-text/v0.2.3/mapbox-gl-rtl-text.js');
+mapboxgl.setRTLTextPlugin('https://api.mapbox.com/mapbox-gl-js/plugins/mapbox-gl-rtl-text/v0.3.0/mapbox-gl-rtl-text.js');
 
 map.on('style.load', () => {
     map.addSource('mapbox://mapbox.mapbox-streets-v8-i18n', {