From 45a7a5684f0773268fd7fa6be8152b6bf16240be Mon Sep 17 00:00:00 2001 From: zhaoqianci Date: Tue, 23 Apr 2024 14:00:06 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=201.=E6=9B=B4=E6=94=B9=E5=9B=BD?= =?UTF-8?q?=E9=99=85=E5=8C=96=202.=E4=BF=AE=E5=A4=8D=E8=87=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E5=AE=98=E6=96=B9=E5=9B=BE=E5=B1=82=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../map-control-group/official-layer-control/index.tsx | 6 +++--- src/locales/langs/en-US.ts | 2 ++ src/locales/langs/zh-CN.ts | 2 ++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/components/map-control-group/official-layer-control/index.tsx b/src/components/map-control-group/official-layer-control/index.tsx index b72147f..1bb8462 100644 --- a/src/components/map-control-group/official-layer-control/index.tsx +++ b/src/components/map-control-group/official-layer-control/index.tsx @@ -78,14 +78,14 @@ export function OfficialLayerControl() { }, { id: OfficeLayerEnum.Google, - title: '谷歌卫星地图（需翻墙）', + title: t('official_layer_control.index.guGeWeiXingTuFanQiang'), image: 'https://mdn.alipayobjects.com/huamei_k6sfo0/afts/img/A*M64rSbdhYJ0AAAAAAAAAAAAADjWqAQ/original', layers: [GOOGLE_TILE_MAP_URL, GOOGLE_TILE_MAP_ROUTER_URL], }, { id: OfficeLayerEnum.Gaode, - title: '高德卫星地图', + title: t('official_layer_control.index.gaoDeWeiXingTu'), image: 'https://mdn.alipayobjects.com/huamei_k6sfo0/afts/img/A*zi2jSqqZ2-8AAAAAAAAAAAAADjWqAQ/original', layers: [GAODE_TILE_MAP_URL, GOOGLE_TILE_MAP_ROUTER_URL], @@ -121,7 +121,7 @@ export function OfficialLayerControl() { if (isEdit) { const cloneCustomTiles = cloneDeep(customTiles); const newImgUrl = Array.isArray(e.img) ? e.img[0].url : `${base64}`; - cloneCustomTiles[editIndex - 2] = { + cloneCustomTiles[editIndex - 4] = { id: e.name, image: newImgUrl, title: e.name, diff --git a/src/locales/langs/en-US.ts b/src/locales/langs/en-US.ts index 2e2eb74..00a6753 100644 --- a/src/locales/langs/en-US.ts +++ b/src/locales/langs/en-US.ts @@ -161,6 +161,8 @@ export default { 'location_search_control.location_search.qingShuRuYaoSou': 'Please enter a place name to search', 'official_layer_control.index.guGeWeiXingTu': 'Google Remote Sensing Maps', + 'official_layer_control.index.guGeWeiXingTuFanQiang': 'Google satellite map (need to climb over the wall)', + 'official_layer_control.index.gaoDeWeiXingTu': 'Gaud satellite map', 'official_layer_control.index.shiLiangDiTu': 'Vector Map', 'save_map_options_control.index.baoCunDiTuZhuang': 'Save Map Status', 'save_map_options_control.index.diTuZhuangTaiBao': diff --git a/src/locales/langs/zh-CN.ts b/src/locales/langs/zh-CN.ts index 7d1eee4..e39fa73 100644 --- a/src/locales/langs/zh-CN.ts +++ b/src/locales/langs/zh-CN.ts @@ -143,6 +143,8 @@ export default { 'location_search_control.index.tianJiaZhiShuJu': '添加至数据', 'location_search_control.location_search.qingShuRuYaoSou': '请输入要搜索地名', 'official_layer_control.index.guGeWeiXingTu': '谷歌卫星地图', + 'official_layer_control.index.guGeWeiXingTuFanQiang': '谷歌卫星地图（需翻墙）', + 'official_layer_control.index.gaoDeWeiXingTu': '高德卫星地图', 'official_layer_control.index.shiLiangDiTu': '矢量地图', 'save_map_options_control.index.baoCunDiTuZhuang': '保存地图状态', 'save_map_options_control.index.diTuZhuangTaiBao': '地图状态保存成功 ', From 2e8e9068062890022d5b6c8fd0f6f557401a051d Mon Sep 17 00:00:00 2001 From: zhaoqianci Date: Tue, 23 Apr 2024 16:32:12 +0800 Subject: [PATCH 2/2] =?UTF-8?q?style:=20=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../map-control-group/official-layer-control/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/map-control-group/official-layer-control/index.tsx b/src/components/map-control-group/official-layer-control/index.tsx index 1bb8462..0219087 100644 --- a/src/components/map-control-group/official-layer-control/index.tsx +++ b/src/components/map-control-group/official-layer-control/index.tsx @@ -121,7 +121,7 @@ export function OfficialLayerControl() { if (isEdit) { const cloneCustomTiles = cloneDeep(customTiles); const newImgUrl = Array.isArray(e.img) ? e.img[0].url : `${base64}`; - cloneCustomTiles[editIndex - 4] = { + cloneCustomTiles[editIndex - BASE_LAYER_GROUP.length] = { id: e.name, image: newImgUrl, title: e.name,