diff --git a/dist/dd-symbolizers.d.ts b/dist/dd-symbolizers.d.ts index 83c6c3ec..46737181 100644 --- a/dist/dd-symbolizers.d.ts +++ b/dist/dd-symbolizers.d.ts @@ -2,7 +2,7 @@ import Point from "@mapbox/point-geometry"; import { Feature } from "./tilecache"; import { Justify, LabelSymbolizer, TextSymbolizer } from "./symbolizer"; import { Label, Layout } from "./labeler"; -export declare enum TextPlacements { +export declare const enum TextPlacements { N = 1, NE = 2, E = 3, diff --git a/dist/dd-symbolizers.js b/dist/dd-symbolizers.js index ea30e0e8..8960e970 100644 --- a/dist/dd-symbolizers.js +++ b/dist/dd-symbolizers.js @@ -3,17 +3,6 @@ import Point from "@mapbox/point-geometry"; import { GeomType } from "./tilecache"; // @ts-ignore import { Justify, TextSymbolizer } from "./symbolizer"; -export var TextPlacements; -(function (TextPlacements) { - TextPlacements[TextPlacements["N"] = 1] = "N"; - TextPlacements[TextPlacements["NE"] = 2] = "NE"; - TextPlacements[TextPlacements["E"] = 3] = "E"; - TextPlacements[TextPlacements["SE"] = 4] = "SE"; - TextPlacements[TextPlacements["S"] = 5] = "S"; - TextPlacements[TextPlacements["SW"] = 6] = "SW"; - TextPlacements[TextPlacements["W"] = 7] = "W"; - TextPlacements[TextPlacements["NW"] = 8] = "NW"; -})(TextPlacements || (TextPlacements = {})); export class DataDrivenOffsetSymbolizer { constructor(symbolizer, options) { this.getBbox = (anchor, bbOrigin, firstLabelBbox) => { @@ -28,14 +17,14 @@ export class DataDrivenOffsetSymbolizer { this.offsetX = options.offsetX || 0; this.offsetY = options.offsetY || 0; this.placements = options.placements || [ - TextPlacements.NE, - TextPlacements.SW, - TextPlacements.NW, - TextPlacements.SE, - TextPlacements.N, - TextPlacements.S, - TextPlacements.E, - TextPlacements.W, + 2 /* NE */, + 6 /* SW */, + 8 /* NW */, + 4 /* SE */, + 1 /* N */, + 5 /* S */, + 3 /* E */, + 7 /* W */, ]; this.attrs = options.attrs || @@ -97,9 +86,9 @@ export class DataDrivenOffsetSymbolizer { computeXAxisOffset(offsetX, fb, placement) { const labelWidth = fb.maxX; const labelHalfWidth = labelWidth / 2; - if ([TextPlacements.N, TextPlacements.S].includes(placement)) + if ([1 /* N */, 5 /* S */].includes(placement)) return offsetX - labelHalfWidth; - if ([TextPlacements.NW, TextPlacements.W, TextPlacements.SW].includes(placement)) + if ([8 /* NW */, 7 /* W */, 6 /* SW */].includes(placement)) return -offsetX - labelWidth; return offsetX; } @@ -107,20 +96,20 @@ export class DataDrivenOffsetSymbolizer { const labelHalfHeight = Math.abs(fb.minY); const labelBottom = fb.maxY; const labelCenterHeight = (fb.minY + fb.maxY) / 2; - if ([TextPlacements.E, TextPlacements.W].includes(placement)) + if ([3 /* E */, 7 /* W */].includes(placement)) return offsetY - labelCenterHeight; - if ([TextPlacements.NW, TextPlacements.NE, TextPlacements.N].includes(placement)) + if ([8 /* NW */, 2 /* NE */, 1 /* N */].includes(placement)) return -offsetY - labelBottom; - if ([TextPlacements.SW, TextPlacements.SE, TextPlacements.S].includes(placement)) + if ([6 /* SW */, 4 /* SE */, 5 /* S */].includes(placement)) return offsetY + labelHalfHeight; return offsetY; } computeJustify(fixedJustify, placement) { if (fixedJustify) return fixedJustify; - if ([TextPlacements.N, TextPlacements.S].includes(placement)) + if ([1 /* N */, 5 /* S */].includes(placement)) return Justify.Center; - if ([TextPlacements.NE, TextPlacements.E, TextPlacements.SE].includes(placement)) + if ([2 /* NE */, 3 /* E */, 4 /* SE */].includes(placement)) return Justify.Left; return Justify.Right; } diff --git a/src/dd-symbolizers.ts b/src/dd-symbolizers.ts index 85311e69..61ef519d 100644 --- a/src/dd-symbolizers.ts +++ b/src/dd-symbolizers.ts @@ -6,7 +6,7 @@ import { Justify, LabelSymbolizer, TextSymbolizer } from "./symbolizer"; import { NumberAttr } from "./attribute"; import { Label, Layout } from "./labeler"; -export enum TextPlacements { +export const enum TextPlacements { N = 1, NE = 2, E = 3,