cleaning + update render tests

maplibre · Nov 11, 2024 · e0030d9 · e0030d9
1 parent 08ff664
commit e0030d9
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 24 deletions.
diff --git a/src/symbol/shaping.ts b/src/symbol/shaping.ts
@@ -712,6 +712,7 @@ function shapeLines(shaping: Shaping,
             const section = line.getSection(i);
             const sectionIndex = line.getSectionIndex(i);
             const codePoint = line.getCharCode(i);
+
             let baselineOffset = 0.0;
             let metrics: GlyphMetrics | null = null;
             let rect = null;
@@ -776,34 +777,23 @@ function shapeLines(shaping: Shaping,
                 }
             }
 
+            positionedGlyphs.push({
+                glyph: codePoint,
+                imageName,
+                x,
+                y: y + baselineOffset + SHAPING_DEFAULT_OFFSET,
+                vertical,
+                scale: section.scale,
+                fontStack: section.fontStack,
+                sectionIndex,
+                metrics,
+                rect
+            });
+
             if (!vertical) {
-                positionedGlyphs.push({
-                    glyph: codePoint,
-                    imageName,
-                    x,
-                    y: y + baselineOffset + SHAPING_DEFAULT_OFFSET,
-                    vertical,
-                    scale: section.scale,
-                    fontStack: section.fontStack,
-                    sectionIndex,
-                    metrics,
-                    rect
-                });
                 x += metrics.advance * section.scale + spacing;
             } else {
                 shaping.verticalizable = true;
-                positionedGlyphs.push({
-                    glyph: codePoint,
-                    imageName,
-                    x,
-                    y: y + baselineOffset + SHAPING_DEFAULT_OFFSET,
-                    vertical,
-                    scale: section.scale,
-                    fontStack: section.fontStack,
-                    sectionIndex,
-                    metrics,
-                    rect
-                });
                 x += verticalAdvance * section.scale + spacing;
             }
         }

diff --git a/.../integration/render/tests/text-field/formatted-vertical-align-line/expected.png b/.../integration/render/tests/text-field/formatted-vertical-align-line/expected.png
diff --git a/test/integration/render/tests/text-field/formatted-vertical-align/expected.png b/test/integration/render/tests/text-field/formatted-vertical-align/expected.png