Move maybePrepare upper in the WorkerTile.parse scope (mapbox#12706)

* Move `maybePrepare` upper in the WorkerTile.parse scope * Fix maybePrepare calls
sienki-jenki · May 10, 2023 · ed8d802 · ed8d802
1 parent 25d64f3
commit ed8d802
Showing 1 changed file with 42 additions and 42 deletions.
diff --git a/src/source/worker_tile.js b/src/source/worker_tile.js
@@ -183,47 +183,6 @@ class WorkerTile {
         let patternMap: {[_: string]: StyleImage};
         const taskMetadata = {type: 'maybePrepare', isSymbolTile: this.isSymbolTile, zoom: this.zoom};
 
-        const stacks = mapObject(options.glyphDependencies, (glyphs) => Object.keys(glyphs).map(Number));
-        if (Object.keys(stacks).length) {
-            actor.send('getGlyphs', {uid: this.uid, stacks}, (err, result) => {
-                if (!error) {
-                    error = err;
-                    glyphMap = result;
-                    maybePrepare.call(this);
-                }
-            }, undefined, false, taskMetadata);
-        } else {
-            glyphMap = {};
-        }
-
-        const icons = Object.keys(options.iconDependencies);
-        if (icons.length) {
-            actor.send('getImages', {icons, source: this.source, tileID: this.tileID, type: 'icons'}, (err, result) => {
-                if (!error) {
-                    error = err;
-                    iconMap = result;
-                    maybePrepare.call(this);
-                }
-            }, undefined, false, taskMetadata);
-        } else {
-            iconMap = {};
-        }
-
-        const patterns = Object.keys(options.patternDependencies);
-        if (patterns.length) {
-            actor.send('getImages', {icons: patterns, source: this.source, tileID: this.tileID, type: 'patterns'}, (err, result) => {
-                if (!error) {
-                    error = err;
-                    patternMap = result;
-                    maybePrepare.call(this);
-                }
-            }, undefined, false, taskMetadata);
-        } else {
-            patternMap = {};
-        }
-
-        PerformanceUtils.endMeasure(m);
-
         const maybePrepare = () => {
             if (error) {
                 return callback(error);
@@ -274,7 +233,48 @@ class WorkerTile {
             }
         };
 
-        maybePrepare.call(this);
+        const stacks = mapObject(options.glyphDependencies, (glyphs) => Object.keys(glyphs).map(Number));
+        if (Object.keys(stacks).length) {
+            actor.send('getGlyphs', {uid: this.uid, stacks}, (err, result) => {
+                if (!error) {
+                    error = err;
+                    glyphMap = result;
+                    maybePrepare();
+                }
+            }, undefined, false, taskMetadata);
+        } else {
+            glyphMap = {};
+        }
+
+        const icons = Object.keys(options.iconDependencies);
+        if (icons.length) {
+            actor.send('getImages', {icons, source: this.source, tileID: this.tileID, type: 'icons'}, (err, result) => {
+                if (!error) {
+                    error = err;
+                    iconMap = result;
+                    maybePrepare();
+                }
+            }, undefined, false, taskMetadata);
+        } else {
+            iconMap = {};
+        }
+
+        const patterns = Object.keys(options.patternDependencies);
+        if (patterns.length) {
+            actor.send('getImages', {icons: patterns, source: this.source, tileID: this.tileID, type: 'patterns'}, (err, result) => {
+                if (!error) {
+                    error = err;
+                    patternMap = result;
+                    maybePrepare();
+                }
+            }, undefined, false, taskMetadata);
+        } else {
+            patternMap = {};
+        }
+
+        PerformanceUtils.endMeasure(m);
+
+        maybePrepare();
     }
 }