From 231ed8b3de4866ceb5bbb9833c0a7afaee9583d6 Mon Sep 17 00:00:00 2001
From: 徐旺旺 <11530253@qq.com>
Date: 星期五, 12 三月 2021 18:15:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/conf/MapConfig.js | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/conf/MapConfig.js b/src/conf/MapConfig.js
index 9eed49f..8e502d3 100644
--- a/src/conf/MapConfig.js
+++ b/src/conf/MapConfig.js
@@ -1,14 +1,14 @@
锘縤mport * as L from 'leaflet'
import TDT from './TDT'
-import { ServiceLayers, PointLayers } from './Layers'
+import { LayerSewersLine, LayerSewersPoint } from './LayerSewers'
const curWwwPath = window.document.location.href
const pathname = window.document.location.pathname
const pos = curWwwPath.indexOf(pathname)
const HOST_URL = curWwwPath.substring(0, pos)
// service涓绘満閰嶇疆
-const APP_GIS_HOST = 'http://xearth.cn:6299'
-// const APP_GIS_HOST_PIPELINE = 'http://xearth.cn:6289'
+// const APP_GIS_HOST = 'http://xearth.cn:6299'
+const APP_GIS_HOST = 'http://xearth.cn:6289'
// 鑷畾涔変富鏈洪厤缃�
const BLUEMAP_HOST = APP_GIS_HOST // 鍏徃鍙戝竷鐨勫湴鍥炬湇鍔★紝鐢ㄤ簬娴嬭瘯鐨勫湴鍧�
@@ -27,16 +27,17 @@
inertia: true,
zoomControl: false,
attributionControl: false,
- editable: true
+ editable: true,
+ preferCanvas: true
}
const mapConfig = {
IsLoadMapByToken: true, // 鏄惁閫氳繃token鍔犺浇鍦板浘
showBaseMapType: 1, // 1鏄剧ず澶╁湴鍥撅紝2鏄剧ずarcgis鍦板浘
+ // defaultBasemapCode: 'tianditu_img', // 榛樿鏄剧ず 鍦板浘绫诲瀷
IntranetBaseMaps: TDT.intranet,
InternetBaseMaps: TDT.internet,
- ServiceLayers: ServiceLayers,
- PointLayers: PointLayers
+ Layers: { LayerSewersLine: [LayerSewersLine], layerSewersPoint: LayerSewersPoint } // 姹￠洦姘村浘灞傞厤缃�
}
/**
@@ -57,6 +58,5 @@
mapOptions,
mapConfig,
TokenConfig,
-
BLUEMAP_HOST
}
--
Gitblit v1.8.0