p90524618
/
antv-l7
mirror of https://gitee.com/antv-l7/antv-l7
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: text overlap

This commit is contained in:
thinkinggis 2020-01-23 00:31:48 +08:00
parent dc914476b1
commit 77020ce1cf
5 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/layers/src/point/models/text.ts
View File

@ -104,6 +104,7 @@ export default class TextModel extends BaseModel {
} }
public buildModels(): IModel[] { public buildModels(): IModel[] {
this.extent = this.textExtent();
this.initGlyph(); this.initGlyph();
this.updateTexture(); this.updateTexture();
this.filterGlyphs(); this.filterGlyphs();

1
packages/source/src/source.ts
View File

@ -137,6 +137,7 @@ export default class Source extends EventEmitter {
public getFeatureById(id: number): unknown { public getFeatureById(id: number): unknown {
const { type = 'geojson' } = this.parser; const { type = 'geojson' } = this.parser;
if (type === 'geojson' && !this.cluster) { if (type === 'geojson' && !this.cluster) {
// TODO： 聚合图层返回聚合和后的数据
return id < this.rawData.features.length return id < this.rawData.features.length
? this.rawData.features[id] ? this.rawData.features[id]
: 'null'; : 'null';

8
packages/source/src/transform/hexagon.ts
View File

@ -20,7 +20,7 @@ interface IRawData {
} }
export function pointToHexbin(data: IParserData, option: ITransform) { export function pointToHexbin(data: IParserData, option: ITransform) {
const dataArray = data.dataArray; const dataArray = data.dataArray;
const { size = 10 } = option; const { size = 10, method = 'sum' } = option;
const pixlSize = ((size / (2 * Math.PI * R_EARTH)) * (256 << 20)) / 2; const pixlSize = ((size / (2 * Math.PI * R_EARTH)) * (256 << 20)) / 2;
const screenPoints: IRawData[] = dataArray.map((point: IParseDataItem) => { const screenPoints: IRawData[] = dataArray.map((point: IParseDataItem) => {
const [x, y] = aProjectFlat(point.coordinates); const [x, y] = aProjectFlat(point.coordinates);
@ -38,12 +38,12 @@ export function pointToHexbin(data: IParserData, option: ITransform) {
const result: IParserData = { const result: IParserData = {
dataArray: hexbinBins.map((hex: IHexBinItem<IRawData>, index: number) => { dataArray: hexbinBins.map((hex: IHexBinItem<IRawData>, index: number) => {
if (option.field && option.method) { if (option.field && method) {
const columns = getColumn(hex, option.field); const columns = getColumn(hex, option.field);
hex[option.method] = statMap[option.method](columns); hex[method] = statMap[method](columns);
} }
return { return {
[option.method]: hex[option.method], [option.method]: hex[method],
count: hex.length, count: hex.length,
coordinates: [hex.x, hex.y], coordinates: [hex.x, hex.y],
_id: index + 1, _id: index + 1,

2
packages/source/src/transform/join.ts
View File

@ -14,7 +14,7 @@ export function join(geoData: IParserData, options: { [key: string]: any }) {
const { field, data } = options; const { field, data } = options;
const dataObj: { [key: string]: any } = {}; const dataObj: { [key: string]: any } = {};
data.forEach((element: { [key: string]: any }) => { data.forEach((element: { [key: string]: any }) => {
dataObj[element.field] = element; dataObj[element[field]] = element;
}); });
geoData.dataArray = data.dataArray.map((item: IParseDataItem) => { geoData.dataArray = data.dataArray.map((item: IParseDataItem) => {
const joinName = item[field]; const joinName = item[field];

1
stories/Layers/components/Text.tsx
View File

@ -43,6 +43,7 @@ export default class TextLayerDemo extends React.Component {
.size(12) .size(12)
.color('#fff') .color('#fff')
.style({ .style({
textAllowOverlap: true,
// fontWeight: 200, // fontWeight: 200,
// textAnchor: 'center', // 文本相对锚点的位置 center|left|right|top|bottom|top-left // textAnchor: 'center', // 文本相对锚点的位置 center|left|right|top|bottom|top-left
// textOffset: [0, 0], // 文本相对锚点的偏移量 [水平, 垂直] // textOffset: [0, 0], // 文本相对锚点的偏移量 [水平, 垂直]