From 0a0080a207a39e51a30a23a41c2054e842f36dae Mon Sep 17 00:00:00 2001 From: wangqi <magical1908@outlook.com> Date: 星期二, 06 四月 2021 18:21:27 +0800 Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop --- src/conf/MapConfig.js | 21 ++++++++++++++++----- 1 files changed, 16 insertions(+), 5 deletions(-) diff --git a/src/conf/MapConfig.js b/src/conf/MapConfig.js index 0b6c329..9620d76 100644 --- a/src/conf/MapConfig.js +++ b/src/conf/MapConfig.js @@ -1,7 +1,9 @@ 锘縤mport * as L from 'leaflet' import TDT from './TDT' -import { LayerSewersLine, LayerSewersPoint } from './LayerSewers' -import { LayerWasteWater } from './LayerWasteWater' +import { LayerSewersPoint } from './layers/LayerSewers' +import { LayerTopic } from './LayerTopic' +import { LayerPipeLine } from './LayerPipeLine' + const curWwwPath = window.document.location.href const pathname = window.document.location.pathname const pos = curWwwPath.indexOf(pathname) @@ -22,7 +24,8 @@ minZoom: 3, maxZoom: 18, // center: [26, 104], - center: [32.224016189575195, 118.77070426940918], + center: [38.828558921813965, 117.41676807403564], + // center: [29.454345703125, 113.40362548828125], zoom: 14, worldCopyJump: true, inertia: true, @@ -38,9 +41,16 @@ // defaultBasemapCode: 'tianditu_img', // 榛樿鏄剧ず 鍦板浘绫诲瀷 IntranetBaseMaps: TDT.intranet, InternetBaseMaps: TDT.internet, - Layers: { LayerSewersLine: [LayerSewersLine, LayerWasteWater], layerSewersPoint: LayerSewersPoint } // 姹¢洦姘村浘灞傞厤缃� + Layers: { + LayerSewersLine: [LayerPipeLine, LayerTopic], + layerSewersPoint: LayerSewersPoint + } // 姹¢洦姘村浘灞傞厤缃� } +const mapTokenArray = ['5d76218063082952d18b76da5005f490', + 'f1b72b5e7cb1175acddfa485f1bc9770', + 'ac8bbce8119b337d75d4b06696f6186d', + '9bf834ce1ba3ba01c568147e9bfcab7c'] /** * 鍐呯綉GIS锛岃幏鍙杢oken鍙傛暟 */ @@ -76,6 +86,7 @@ mapOptions, mapConfig, TokenConfig, - BLUEMAP_HOST + BLUEMAP_HOST, + mapTokenArray // MagicMaker } -- Gitblit v1.8.0