Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Only shape point placement symbols #8706

Merged
merged 4 commits into from
Sep 17, 2019
Merged

Only shape point placement symbols #8706

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3322e6b
only shape point placement symbols
malwoodsantoro Aug 29, 2019
d7b1e0a
fix unit tests to reflect added symbolPlacement argument
malwoodsantoro Sep 3, 2019
72aca56
make adjustments to tests to appropriately account for text-max-width…
malwoodsantoro Sep 5, 2019
49402b3
fix coordinates in zero-width-point-placement
malwoodsantoro Sep 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions src/symbol/shaping.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,8 @@ function shapeText(text: Formatted,
spacing: number,
translate: [number, number],
writingMode: 1 | 2,
allowVerticalPlacement: boolean): Shaping | false {
allowVerticalPlacement: boolean,
symbolPlacement: string): Shaping | false {
const logicalInput = TaggedString.fromFeature(text, defaultFontStack);

if (writingMode === WritingMode.vertical) {
Expand All @@ -169,7 +170,7 @@ function shapeText(text: Formatted,
lines = [];
const untaggedLines =
processBidirectionalText(logicalInput.toString(),
determineLineBreaks(logicalInput, spacing, maxWidth, glyphs));
determineLineBreaks(logicalInput, spacing, maxWidth, glyphs, symbolPlacement));
for (const line of untaggedLines) {
const taggedLine = new TaggedString();
taggedLine.text = line;
Expand All @@ -186,7 +187,7 @@ function shapeText(text: Formatted,
const processedLines =
processStyledBidirectionalText(logicalInput.text,
logicalInput.sectionIndex,
determineLineBreaks(logicalInput, spacing, maxWidth, glyphs));
determineLineBreaks(logicalInput, spacing, maxWidth, glyphs, symbolPlacement));
for (const line of processedLines) {
const taggedLine = new TaggedString();
taggedLine.text = line[0];
Expand All @@ -195,7 +196,7 @@ function shapeText(text: Formatted,
lines.push(taggedLine);
}
} else {
lines = breakLines(logicalInput, determineLineBreaks(logicalInput, spacing, maxWidth, glyphs));
lines = breakLines(logicalInput, determineLineBreaks(logicalInput, spacing, maxWidth, glyphs, symbolPlacement));
}

const positionedGlyphs = [];
Expand Down Expand Up @@ -358,8 +359,9 @@ function leastBadBreaks(lastLineBreak: ?Break): Array<number> {
function determineLineBreaks(logicalInput: TaggedString,
spacing: number,
maxWidth: number,
glyphMap: {[string]: {[number]: ?StyleGlyph}}): Array<number> {
if (!maxWidth)
glyphMap: {[string]: {[number]: ?StyleGlyph}},
symbolPlacement: string): Array<number> {
if (symbolPlacement !== 'point')
return [];

if (!logicalInput)
Expand Down
11 changes: 6 additions & 5 deletions src/symbol/symbol_layout.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,8 @@ export function performSymbolLayout(bucket: SymbolBucket,
"center" :
layout.get('text-justify').evaluate(feature, {});

const maxWidth = layout.get('symbol-placement') === 'point' ?
const symbolPlacement = layout.get('symbol-placement');
const maxWidth = symbolPlacement === 'point' ?
layout.get('text-max-width').evaluate(feature, {}) * ONE_EM :
0;

Expand All @@ -193,7 +194,7 @@ export function performSymbolLayout(bucket: SymbolBucket,
// writing mode, thus, default left justification is used. If Latin
// scripts would need to be supported, this should take into account other justifications.
shapedTextOrientations.vertical = shapeText(text, glyphMap, fontstack, maxWidth, lineHeight, textAnchor,
'left', spacingIfAllowed, textOffset, WritingMode.vertical, true);
'left', spacingIfAllowed, textOffset, WritingMode.vertical, true, symbolPlacement);
}
};

Expand All @@ -215,7 +216,7 @@ export function performSymbolLayout(bucket: SymbolBucket,
// If using text-variable-anchor for the layer, we use a center anchor for all shapings and apply
// the offsets for the anchor in the placement step.
const shaping = shapeText(text, glyphMap, fontstack, maxWidth, lineHeight, 'center',
justification, spacingIfAllowed, textOffset, WritingMode.horizontal, false);
justification, spacingIfAllowed, textOffset, WritingMode.horizontal, false, symbolPlacement);
if (shaping) {
shapedTextOrientations.horizontal[justification] = shaping;
singleLine = shaping.lineCount === 1;
Expand All @@ -231,7 +232,7 @@ export function performSymbolLayout(bucket: SymbolBucket,

// Horizontal point or line label.
const shaping = shapeText(text, glyphMap, fontstack, maxWidth, lineHeight, textAnchor, textJustify, spacingIfAllowed,
textOffset, WritingMode.horizontal, false);
textOffset, WritingMode.horizontal, false, symbolPlacement);
if (shaping) shapedTextOrientations.horizontal[textJustify] = shaping;

// Vertical point label (if allowVerticalPlacement is enabled).
Expand All @@ -240,7 +241,7 @@ export function performSymbolLayout(bucket: SymbolBucket,
// Verticalized line label.
if (allowsVerticalWritingMode(unformattedText) && textAlongLine && keepUpright) {
shapedTextOrientations.vertical = shapeText(text, glyphMap, fontstack, maxWidth, lineHeight, textAnchor, textJustify,
spacingIfAllowed, textOffset, WritingMode.vertical, false);
spacingIfAllowed, textOffset, WritingMode.vertical, false, symbolPlacement);
}
}

Expand Down
3 changes: 2 additions & 1 deletion test/integration/render-tests/symbol-placement/line-center-buffer/style.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@
"text-font": [
"Open Sans Semibold",
"Arial Unicode MS Bold"
]
],
"text-max-width": 0
}
},
{
Expand Down
Binary file removed test/integration/render-tests/text-max-width/unlimited/expected.png
View file
Open in desktop
Binary file not shown.
Binary file added ...integration/render-tests/text-max-width/zero-width-point-placement/expected.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
0 ...tests/text-max-width/unlimited/style.json → ...dth/zero-width-point-placement/style.json
View file
Open in desktop
File renamed without changes.
24 changes: 12 additions & 12 deletions test/unit/symbol/shaping.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,58 +21,58 @@ test('shaping', (t) => {

JSON.parse('{}');

shaped = shaping.shapeText(Formatted.fromString(`hi${String.fromCharCode(0)}`), glyphs, fontStack, 15 * oneEm, oneEm, 'center', 'center', 0 * oneEm, [0, 0], WritingMode.horizontal);
shaped = shaping.shapeText(Formatted.fromString(`hi${String.fromCharCode(0)}`), glyphs, fontStack, 15 * oneEm, oneEm, 'center', 'center', 0 * oneEm, [0, 0], WritingMode.horizontal, false, 'point');
if (UPDATE) fs.writeFileSync(path.join(__dirname, '/../../expected/text-shaping-null.json'), JSON.stringify(shaped, null, 2));
t.deepEqual(shaped, JSON.parse(fs.readFileSync(path.join(__dirname, '/../../expected/text-shaping-null.json'))));

// Default shaping.
shaped = shaping.shapeText(Formatted.fromString('abcde'), glyphs, fontStack, 15 * oneEm, oneEm, 'center', 'center', 0 * oneEm, [0, 0], WritingMode.horizontal);
shaped = shaping.shapeText(Formatted.fromString('abcde'), glyphs, fontStack, 15 * oneEm, oneEm, 'center', 'center', 0 * oneEm, [0, 0], WritingMode.horizontal, false, 'point');
if (UPDATE) fs.writeFileSync(path.join(__dirname, '/../../expected/text-shaping-default.json'), JSON.stringify(shaped, null, 2));
t.deepEqual(shaped, JSON.parse(fs.readFileSync(path.join(__dirname, '/../../expected/text-shaping-default.json'))));

// Letter spacing.
shaped = shaping.shapeText(Formatted.fromString('abcde'), glyphs, fontStack, 15 * oneEm, oneEm, 'center', 'center', 0.125 * oneEm, [0, 0], WritingMode.horizontal);
shaped = shaping.shapeText(Formatted.fromString('abcde'), glyphs, fontStack, 15 * oneEm, oneEm, 'center', 'center', 0.125 * oneEm, [0, 0], WritingMode.horizontal, false, 'point');
if (UPDATE) fs.writeFileSync(path.join(__dirname, '/../../expected/text-shaping-spacing.json'), JSON.stringify(shaped, null, 2));
t.deepEqual(shaped, JSON.parse(fs.readFileSync(path.join(__dirname, '/../../expected/text-shaping-spacing.json'))));

// Line break.
shaped = shaping.shapeText(Formatted.fromString('abcde abcde'), glyphs, fontStack, 4 * oneEm, oneEm, 'center', 'center', 0 * oneEm, [0, 0], WritingMode.horizontal);
shaped = shaping.shapeText(Formatted.fromString('abcde abcde'), glyphs, fontStack, 4 * oneEm, oneEm, 'center', 'center', 0 * oneEm, [0, 0], WritingMode.horizontal, false, 'point');
if (UPDATE) fs.writeFileSync(path.join(__dirname, '/../../expected/text-shaping-linebreak.json'), JSON.stringify(shaped, null, 2));
t.deepEqual(shaped, require('../../expected/text-shaping-linebreak.json'));

const expectedNewLine = JSON.parse(fs.readFileSync(path.join(__dirname, '/../../expected/text-shaping-newline.json')));

shaped = shaping.shapeText(Formatted.fromString('abcde\nabcde'), glyphs, fontStack, 15 * oneEm, oneEm, 'center', 'center', 0, [0, 0], WritingMode.horizontal);
shaped = shaping.shapeText(Formatted.fromString('abcde\nabcde'), glyphs, fontStack, 15 * oneEm, oneEm, 'center', 'center', 0, [0, 0], WritingMode.horizontal, false, 'point');
if (UPDATE) fs.writeFileSync(path.join(__dirname, '/../../expected/text-shaping-newline.json'), JSON.stringify(shaped, null, 2));
t.deepEqual(shaped, expectedNewLine);

shaped = shaping.shapeText(Formatted.fromString('abcde\r\nabcde'), glyphs, fontStack, 15 * oneEm, oneEm, 'center', 'center', 0, [0, 0], WritingMode.horizontal);
shaped = shaping.shapeText(Formatted.fromString('abcde\r\nabcde'), glyphs, fontStack, 15 * oneEm, oneEm, 'center', 'center', 0, [0, 0], WritingMode.horizontal, false, 'point');
t.deepEqual(shaped.positionedGlyphs, expectedNewLine.positionedGlyphs);

const expectedNewLinesInMiddle = JSON.parse(fs.readFileSync(path.join(__dirname, '/../../expected/text-shaping-newlines-in-middle.json')));

shaped = shaping.shapeText(Formatted.fromString('abcde\n\nabcde'), glyphs, fontStack, 15 * oneEm, oneEm, 'center', 'center', 0, [0, 0], WritingMode.horizontal);
shaped = shaping.shapeText(Formatted.fromString('abcde\n\nabcde'), glyphs, fontStack, 15 * oneEm, oneEm, 'center', 'center', 0, [0, 0], WritingMode.horizontal, false, 'point');
if (UPDATE) fs.writeFileSync(path.join(__dirname, '/../../expected/text-shaping-newlines-in-middle.json'), JSON.stringify(shaped, null, 2));
t.deepEqual(shaped, expectedNewLinesInMiddle);

// Prefer zero width spaces when breaking lines. Zero width spaces are used by Mapbox data sources as a hint that
// a position is ideal for breaking.
const expectedZeroWidthSpaceBreak = JSON.parse(fs.readFileSync(path.join(__dirname, '/../../expected/text-shaping-zero-width-space.json')));

shaped = shaping.shapeText(Formatted.fromString('三三\u200b三三\u200b三三\u200b三三三三三三\u200b三三'), glyphs, fontStack, 5 * oneEm, oneEm, 'center', 'center', 0, [0, 0], WritingMode.horizontal);
shaped = shaping.shapeText(Formatted.fromString('三三\u200b三三\u200b三三\u200b三三三三三三\u200b三三'), glyphs, fontStack, 5 * oneEm, oneEm, 'center', 'center', 0, [0, 0], WritingMode.horizontal, false, 'point');
if (UPDATE) fs.writeFileSync(path.join(__dirname, '/../../expected/text-shaping-zero-width-space.json'), JSON.stringify(shaped, null, 2));
t.deepEqual(shaped, expectedZeroWidthSpaceBreak);

// Null shaping.
shaped = shaping.shapeText(Formatted.fromString(''), glyphs, fontStack, 15 * oneEm, oneEm, 'center', 'center', 0 * oneEm, [0, 0], WritingMode.horizontal);
shaped = shaping.shapeText(Formatted.fromString(''), glyphs, fontStack, 15 * oneEm, oneEm, 'center', 'center', 0 * oneEm, [0, 0], WritingMode.horizontal, false, 'point');
t.equal(false, shaped);

shaped = shaping.shapeText(Formatted.fromString(String.fromCharCode(0)), glyphs, fontStack, 15 * oneEm, oneEm, 'center', 'center', 0 * oneEm, [0, 0], WritingMode.horizontal);
shaped = shaping.shapeText(Formatted.fromString(String.fromCharCode(0)), glyphs, fontStack, 15 * oneEm, oneEm, 'center', 'center', 0 * oneEm, [0, 0], WritingMode.horizontal, false, 'point');
t.equal(false, shaped);

// https://github.com/mapbox/mapbox-gl-js/issues/3254
shaped = shaping.shapeText(Formatted.fromString(' foo bar\n'), glyphs, fontStack, 15 * oneEm, oneEm, 'center', 'center', 0 * oneEm, [0, 0], WritingMode.horizontal);
const shaped2 = shaping.shapeText(Formatted.fromString('foo bar'), glyphs, fontStack, 15 * oneEm, oneEm, 'center', 'center', 0 * oneEm, [0, 0], WritingMode.horizontal);
shaped = shaping.shapeText(Formatted.fromString(' foo bar\n'), glyphs, fontStack, 15 * oneEm, oneEm, 'center', 'center', 0 * oneEm, [0, 0], WritingMode.horizontal, false, 'point');
const shaped2 = shaping.shapeText(Formatted.fromString('foo bar'), glyphs, fontStack, 15 * oneEm, oneEm, 'center', 'center', 0 * oneEm, [0, 0], WritingMode.horizontal, false, 'point');
t.same(shaped.positionedGlyphs, shaped2.positionedGlyphs);

t.end();
Expand Down