diff --git a/modules/layers/src/text-layer/multi-icon-layer/multi-icon-layer.js b/modules/layers/src/text-layer/multi-icon-layer/multi-icon-layer.js index c5e426e492b..b47779c54e6 100644 --- a/modules/layers/src/text-layer/multi-icon-layer/multi-icon-layer.js +++ b/modules/layers/src/text-layer/multi-icon-layer/multi-icon-layer.js @@ -30,7 +30,8 @@ const EMPTY_ARRAY = []; const defaultProps = { backgroundColor: {type: 'color', value: null, optional: true}, - getIconOffsets: {type: 'accessor', value: x => x.offsets} + getIconOffsets: {type: 'accessor', value: x => x.offsets}, + alphaCutoff: 0 }; export default class MultiIconLayer extends IconLayer { diff --git a/modules/layers/src/text-layer/text-layer.js b/modules/layers/src/text-layer/text-layer.js index ddd6c2ee507..14c89646be5 100644 --- a/modules/layers/src/text-layer/text-layer.js +++ b/modules/layers/src/text-layer/text-layer.js @@ -259,7 +259,7 @@ export default class TextLayer extends CompositeLayer { getAngle, getPixelOffset, billboard, - sdf, + fontSettings, sizeScale, sizeUnits, sizeMinPixels, @@ -274,7 +274,7 @@ export default class TextLayer extends CompositeLayer { return new SubLayerClass( { - sdf, + sdf: fontSettings.sdf, iconAtlas: texture, iconMapping: mapping, backgroundColor, diff --git a/test/modules/layers/text-layer/text-layer.spec.js b/test/modules/layers/text-layer/text-layer.spec.js index 9913c37e280..8fba7b0485a 100644 --- a/test/modules/layers/text-layer/text-layer.spec.js +++ b/test/modules/layers/text-layer/text-layer.spec.js @@ -23,6 +23,36 @@ test('TextLayer', t => { t.end(); }); +test('TextLayer - sdf', t => { + const testCases = [ + { + props: { + data: FIXTURES.points, + getText: d => d.ADDRESS, + getPosition: d => d.COORDINATES + }, + onAfterUpdate: ({subLayer}) => { + t.notOk(subLayer.props.sdf, 'sublayer props.sdf'); + t.is(subLayer.props.alphaCutoff, 0, 'sublayer props.alphaCutoff'); + } + }, + { + updateProps: { + fontSettings: { + sdf: true, + buffer: 10 + } + }, + onAfterUpdate: ({subLayer}) => { + t.ok(subLayer.props.sdf, 'sublayer props.sdf'); + } + } + ]; + testLayer({Layer: TextLayer, testCases, onError: t.notOk}); + + t.end(); +}); + test('TextLayer - binary', t => { const value = new Uint8Array([72, 101, 108, 108, 111, 32, 119, 111, 114, 108, 100, 33]); const startIndices = [0, 6];