refactor getRectAndMetrics

maplibre · Jan 22, 2025 · 94bdeb4 · 94bdeb4
1 parent 83472aa
commit 94bdeb4
Showing 1 changed file with 10 additions and 13 deletions.
diff --git a/src/symbol/shaping.ts b/src/symbol/shaping.ts
@@ -639,22 +639,19 @@ function getRectAndMetrics(
             [_: number]: StyleGlyph;
         };
     },
-    section: SectionOptions, codePoint: number
-) {
-    let rect: Rect = null;
-    let metrics: GlyphMetrics = null;
-
+    section: SectionOptions,
+    codePoint: number
+): GlyphPosition | null {
     if (glyphPosition && glyphPosition.rect) {
-        rect = glyphPosition.rect;
-        metrics = glyphPosition.metrics;
-    } else {
-        const glyphs = glyphMap[section.fontStack];
-        const glyph = glyphs && glyphs[codePoint];
-        if (!glyph) return null;
-        metrics = glyph.metrics;
+        return glyphPosition;
     }
 
-    return {rect, metrics};
+    const glyphs = glyphMap[section.fontStack];
+    const glyph = glyphs && glyphs[codePoint];
+    if (!glyph) return null;
+
+    const metrics = glyph.metrics;
+    return {rect: null, metrics};
 }
 
 function shapeLines(shaping: Shaping,