Skip to content

Commit a2133fd

Browse files
committed
【feature】l7文本上图优化; mvt tiles 代理携带cookie; rest geojson 携带token优化;
1 parent 04c4a65 commit a2133fd

5 files changed

Lines changed: 258 additions & 62 deletions

File tree

‎src/mapboxgl/mapping/utils/L7LayerUtil.js‎

Lines changed: 76 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ function addCredentialToUrl(url, credential) {
181181
if (!credential) {
182182
return url;
183183
}
184-
const tokenInfo = `${credential.key}=${credential.value}`;
184+
const tokenInfo = `${credential.key || credential.name}=${credential.value}`;
185185
const newUrl = url.includes('?') ? `${url}&${tokenInfo}` : `${url}?${tokenInfo}`;
186186
return newUrl;
187187
}
@@ -375,8 +375,12 @@ function transformFeaturesNameAndType(originFeatures, fieldNames, fieldTypes) {
375375
return formatFeatures(features, fieldInfo);
376376
}
377377

378+
function isIportalProxyServiceUrl(url, options) {
379+
return options.iportalServiceProxyUrl && url.indexOf(options.iportalServiceProxyUrl) >= 0;
380+
}
381+
378382
function handleWithRequestOptions(url, options) {
379-
if (options.iportalServiceProxyUrl && url.indexOf(options.iportalServiceProxyUrl) >= 0) {
383+
if (isIportalProxyServiceUrl(url, options)) {
380384
return { ...options, withCredentials: true };
381385
}
382386
return { ...options, withCredentials: undefined };
@@ -398,7 +402,8 @@ async function getRestDataGeojsonByWebMap(data, options) {
398402
const datasetUrl = `${url.split('featureResults')[0]}datasources/${dataSourceName}/datasets/${datasetName}`;
399403
const nextOptions = handleWithRequestOptions(datasetUrl, options);
400404
const { fieldNames, fieldTypes } = await getRestDataFieldInfo(datasetUrl, credential, nextOptions);
401-
const attrDataInfo = await FetchRequest.post(url, JSON.stringify(SQLParams), nextOptions);
405+
const nextUrl = addCredentialToUrl(url, credential);
406+
const attrDataInfo = await FetchRequest.post(nextUrl, JSON.stringify(SQLParams), nextOptions);
402407
const featuresRes = await attrDataInfo.json();
403408

404409
return {
@@ -623,15 +628,23 @@ async function geoJSONSourceToL7Source(source, sourceLayer, options) {
623628
* @param source
624629
* @returns {Object} L7 mvt source
625630
*/
626-
function vectorSourceToL7Source(source, sourceLayer) {
627-
return {
631+
function vectorSourceToL7Source(source, sourceLayer, options) {
632+
const result = {
628633
data: ((source || {}).tiles || [])[0],
629634
parser: {
630635
type: 'mvt',
631636
extent: source.bounds,
632637
sourceLayer
633638
}
634639
};
640+
if (isIportalProxyServiceUrl(result.data, options)) {
641+
Object.assign(result.parser, {
642+
requestParameters: {
643+
credentials: 'include'
644+
}
645+
});
646+
}
647+
return result;
635648
}
636649

637650
/**
@@ -959,6 +972,21 @@ function pickAttrs(obj, includeKeys) {
959972
return obj;
960973
}
961974

975+
function isSolidDasharray(dasharray) {
976+
return dasharray.length === 2 && dasharray[0] === 1 && dasharray[1] === 0;
977+
}
978+
979+
/**
980+
* 根据dasharray获取线型
981+
* @param dasharray
982+
*/
983+
function getLineTypeByDashArray(dasharray) {
984+
if (dasharray && dasharray.length > 1 && !isSolidDasharray(dasharray)) {
985+
return 'dash';
986+
}
987+
return 'solid';
988+
}
989+
962990
/**
963991
* WebMap动画点 转换成sceneLayer
964992
* @param layer
@@ -1052,7 +1080,7 @@ function transformWebmapODLayerToSceneLayer(layer, source, map) {
10521080
values: shape
10531081
},
10541082
style: {
1055-
lineType: dashArray ? 'dash' : 'solid'
1083+
lineType: getLineTypeByDashArray(dashArray)
10561084
}
10571085
};
10581086
for (const key in paint) {
@@ -1155,7 +1183,7 @@ function transformWebmapLineLayerToSceneLayer(layer, source, map) {
11551183
values: 'line'
11561184
},
11571185
style: {
1158-
lineType: dashArray ? 'dash' : 'solid'
1186+
lineType: getLineTypeByDashArray(dashArray)
11591187
}
11601188
};
11611189
for (const key in paint) {
@@ -1371,13 +1399,13 @@ function transformWebmapHeatExtrusionBasicLayerToSceneLayer(layer, source) {
13711399
}
13721400

13731401
/**
1374-
* 将Webmaplayer中的带有高度的symbollayer转换成sceneLayer
1402+
* 将Webmaplayer中的文本图层转换成sceneLayer
13751403
* @param layer
13761404
* @param source
13771405
* @param visible
13781406
* @returns
13791407
*/
1380-
function transformWebmapTextLayerToSceneLayer(layer, source, visible) {
1408+
function transformWebmapTextLayerToSceneLayer(layer, source, visible, map) {
13811409
const { paint, layout } = layer;
13821410
const field = layout['text-field'].split('{')[1].split('}')[0];
13831411
const style = {};
@@ -1386,20 +1414,12 @@ function transformWebmapTextLayerToSceneLayer(layer, source, visible) {
13861414
value !== undefined && (style[TEXT_MAPBOXGL_ANTVL7_KEY[k]] = value);
13871415
});
13881416
return {
1417+
...getL7LayerCommonInfo(layer),
13891418
type: MSLayerType.point,
13901419
id: layer.id,
1391-
options: {
1392-
name: layer.id,
1393-
visible,
1394-
sourceLayer: layer['source-layer']
1395-
},
13961420
source,
1397-
color: {
1398-
values: paint['text-color']
1399-
},
1400-
size: {
1401-
values: layout['text-size']
1402-
},
1421+
color: expressionToFunction({ value: paint['text-color'], property: 'color', map }),
1422+
size: expressionToFunction({ value: layout['text-size'], property: 'size', map }),
14031423
shape: {
14041424
field,
14051425
values: 'text'
@@ -1411,25 +1431,30 @@ function transformWebmapTextLayerToSceneLayer(layer, source, visible) {
14111431
async function restoreL7Layers({ layers, sources, map, options }) {
14121432
const result = [];
14131433
for (const currentLayer of layers) {
1414-
const originSource = sources[currentLayer.source];
1415-
const rules = {
1416-
[SelectStyleTypes.animatePoint]: transformCircleLayerToSceneLayer,
1417-
[SelectStyleTypes.radarPoint]: transformWebmapRadarLayerToSceneLayer,
1418-
[SelectStyleTypes.od]: transformWebmapODLayerToSceneLayer,
1419-
[SelectStyleTypes.column]: transfromPointExtrusionLayerToSceneLayer,
1420-
[SelectStyleTypes.line]: transformWebmapLineLayerToSceneLayer,
1421-
[SelectStyleTypes.bar]: transformWebmapChartLineLayerToSceneLayer,
1422-
[SelectStyleTypes.pie]: transformWebmapChartPieLayerToSceneLayer,
1423-
[SelectStyleTypes.heatGrid]: transformWebmapHeatLayerToSceneLayer,
1424-
[SelectStyleTypes.heat3DGrid]: transformWebmapHeatExtrusionLayerToSceneLayer,
1425-
[SelectStyleTypes.heat3D]: transformWebmapHeatExtrusionBasicLayerToSceneLayer
1426-
};
1427-
const source = await WebMapSourceToL7Source(originSource, currentLayer['source-layer'], options);
1428-
const selectedType = getSelectType(currentLayer);
1429-
result.push(
1430-
(rules[selectedType] || {})(currentLayer, source, map) ||
1431-
transformWebmapTextLayerToSceneLayer(currentLayer, source, (currentLayer || {}).visible)
1432-
);
1434+
try {
1435+
const originSource = sources[currentLayer.source];
1436+
const rules = {
1437+
[SelectStyleTypes.animatePoint]: transformCircleLayerToSceneLayer,
1438+
[SelectStyleTypes.radarPoint]: transformWebmapRadarLayerToSceneLayer,
1439+
[SelectStyleTypes.od]: transformWebmapODLayerToSceneLayer,
1440+
[SelectStyleTypes.column]: transfromPointExtrusionLayerToSceneLayer,
1441+
[SelectStyleTypes.line]: transformWebmapLineLayerToSceneLayer,
1442+
[SelectStyleTypes.bar]: transformWebmapChartLineLayerToSceneLayer,
1443+
[SelectStyleTypes.pie]: transformWebmapChartPieLayerToSceneLayer,
1444+
[SelectStyleTypes.heatGrid]: transformWebmapHeatLayerToSceneLayer,
1445+
[SelectStyleTypes.heat3DGrid]: transformWebmapHeatExtrusionLayerToSceneLayer,
1446+
[SelectStyleTypes.heat3D]: transformWebmapHeatExtrusionBasicLayerToSceneLayer
1447+
};
1448+
const source = await WebMapSourceToL7Source(originSource, currentLayer['source-layer'], options);
1449+
const selectedType = getSelectType(currentLayer);
1450+
result.push(
1451+
(rules[selectedType] && rules[selectedType](currentLayer, source, map)) ||
1452+
transformWebmapTextLayerToSceneLayer(currentLayer, source, (currentLayer || {}).visible, map)
1453+
);
1454+
} catch (error) {
1455+
console.error(error);
1456+
options.emitterEvent('getlayersfailed', { error, map });
1457+
}
14331458
}
14341459
return result;
14351460
}
@@ -1986,13 +2011,18 @@ export async function addL7Layers({ map, webMapInfo, l7Layers, spriteDatas, opti
19862011
// 批量处理L7纹理
19872012
const scene = await getScene(map);
19882013
if (Object.keys(spriteDatas).length > 0) {
1989-
await addTextures({
1990-
layers: formateL7Layers.filter((l) => !!l.texture),
1991-
spriteJson: spriteDatas,
1992-
sprite,
1993-
scene,
1994-
options
1995-
});
2014+
try {
2015+
await addTextures({
2016+
layers: formateL7Layers.filter((l) => !!l.texture),
2017+
spriteJson: spriteDatas,
2018+
sprite,
2019+
scene,
2020+
options
2021+
});
2022+
} catch (error) {
2023+
console.error(error);
2024+
options.emitterEvent('getlayersfailed', { error, map });
2025+
}
19962026
}
19972027
for (const l of formateL7Layers) {
19982028
const layerIndex = layers.findIndex((wLayer) => wLayer.id === l.id);

‎src/mapboxgl/mapping/webmap/v3/WebMap.js‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -454,7 +454,10 @@ export class WebMap extends mapboxgl.Evented {
454454
webMapInfo: { ...this._mapInfo, layers, sources },
455455
l7Layers,
456456
spriteDatas: this._spriteDatas,
457-
options: this.options
457+
options: {
458+
...this.options,
459+
emitterEvent: this.fire.bind(this)
460+
}
458461
});
459462
}
460463
this._createLegendInfo();

‎src/mapboxgl/overlay/L7Layer.js‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ export class L7Layer extends CustomOverlayLayer {
2727
'click',
2828
'dblclick',
2929
'mousemove',
30+
'mouseover',
3031
'mouseout',
3132
'mouseup',
3233
'mousedown',
@@ -337,8 +338,14 @@ export class L7Layer extends CustomOverlayLayer {
337338
}
338339

339340
_formatListenType(type) {
340-
const listenType = type === 'mouseleave' ? 'mouseout' : type;
341-
return listenType;
341+
switch (type) {
342+
case 'mouseover':
343+
return 'mouseenter';
344+
case 'mouseleave':
345+
return 'mouseout';
346+
default:
347+
return type;
348+
}
342349
}
343350

344351
_formateEvent(e) {

0 commit comments

Comments
 (0)