From c4044fb60e53e5c83da4ee645d5160f914e422a3 Mon Sep 17 00:00:00 2001
From: YANGDL <114714267@qq.com>
Date: 星期五, 05 三月 2021 16:17:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/conf/MapConfig.js |  251 ++++++++------------------------------------------
 1 files changed, 40 insertions(+), 211 deletions(-)

diff --git a/src/conf/MapConfig.js b/src/conf/MapConfig.js
index a12465e..4512d66 100644
--- a/src/conf/MapConfig.js
+++ b/src/conf/MapConfig.js
@@ -1,232 +1,61 @@
 锘縤mport * as L from 'leaflet'
-
-let curWwwPath = window.document.location.href
-let pathname = window.document.location.pathname
-let pos = curWwwPath.indexOf(pathname)
-let HOST_URL = curWwwPath.substring(0, pos)
-
-// basemap涓绘満閰嶇疆
-const SINOPEC_GIS_HOST = 'http://10.246.132.249:8080'  // 鍐呯綉澶╁湴鍥句富鏈哄湴鍧�
-const TIANDITU_GIS_HOST = 'http://t0.tianditu.gov.cn' // 鍏綉澶╁湴鍥句富鏈哄湴鍧�
-const TIANDITU_GIS_TOKEN = '5d76218063082952d18b76da5005f490' // 澶囩敤tk: f1b72b5e7cb1175acddfa485f1bc9770
+import TDT from './TDT'
+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 = 'http://xearth.cn:6299'
+const APP_GIS_HOST = 'http://xearth.cn:6289'
 
 // 鑷畾涔変富鏈洪厤缃�
 const BLUEMAP_HOST = APP_GIS_HOST // 鍏徃鍙戝竷鐨勫湴鍥炬湇鍔★紝鐢ㄤ簬娴嬭瘯鐨勫湴鍧�
 
+// const GEOM_POLYLINE = 'POLYLINE'
+// const GEOM_POLYGON = 'POLYGON'
+
 const mapOptions = {
-    crs: L.CRS.EPSG4326,
-    minZoom: 3,
-    maxZoom: 18,
-    center: [26, 104],
-    zoom: 3,
-    worldCopyJump: true,
-    inertia: true,
-    zoomControl: false,
-    attributionControl: false,
-    editable: true
+  crs: L.CRS.EPSG4326,
+  minZoom: 3,
+  maxZoom: 18,
+  // center: [26, 104],
+  center: [32.224016189575195, 118.77070426940918],
+  zoom: 14,
+  worldCopyJump: true,
+  inertia: true,
+  zoomControl: false,
+  attributionControl: false,
+  editable: true,
+  preferCanvas: true
 }
 
 const mapConfig = {
-    IsLoadMapByToken: true, // 鏄惁閫氳繃token鍔犺浇鍦板浘
-    showBaseMapType: 1, // 1鏄剧ず澶╁湴鍥撅紝2鏄剧ずarcgis鍦板浘
-    IntranetBaseMaps: [
-        {
-            code: 'sinopec_img',
-            name: '涓煶鍖栧ぉ鍦板浘褰卞儚',
-            icon_actived: '',
-            icon_deactived: '',
-            isAddToMap: true,
-            map: {
-                layerName: '澶╁湴鍥惧奖鍍忓湴鍥�',
-                type: 'wmts',
-                visible: false,
-                layerType: 'img_c',
-                isLoadMapByToken: true,
-                url: SINOPEC_GIS_HOST + '/OneMapServer/rest/services/base-tdt-image-globe/WMTS?'+
-                'layer=img&style=default&tilematrixset=c&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}',
-                option:{
-                    maxZoom: 18,
-                    minZoom: 1,
-                    zoomOffset: 1
-                }
-            },
-            annotation: {
-                layerName: '澶╁湴鍥惧奖鍍忔爣娉�',
-                type: 'wmts',
-                visible: false,
-                layerType: 'cia_c',
-                isLoadMapByToken: true,
-                url: SINOPEC_GIS_HOST + '/OneMapServer/rest/services/base-tdt-label-image/WMTS?'+
-                'layer=cia&style=default&tilematrixset=c&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}',
-                option:{
-                    maxZoom: 18,
-                    minZoom: 1,
-                    zoomOffset: 1
-                }
-            },
-        },
-        {
-            code: 'sinopec_vec',
-            name: '涓煶鍖栧ぉ鍦板浘鐭㈤噺',
-            icon_actived: '',
-            icon_deactived: '',
-            isAddToMap: false,
-            map: {
-                layerName: '澶╁湴鍥剧煝閲忓湴鍥�',
-                type: 'wmts',
-                visible: false,
-                layerType: 'vec_c',
-                isLoadMapByToken: true,
-                url: SINOPEC_GIS_HOST + '/OneMapServer/rest/services/base-tdt-vector-globe/WMTS?'+
-                'layer=vec&style=default&tilematrixset=c&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}',
-                option:{
-                    maxZoom: 18,
-                    minZoom: 1,
-                    zoomOffset: 1
-                }
-            },
-            annotation: {
-                layerName: '澶╁湴鍥剧煝閲忔爣娉�',
-                type: 'wmts',
-                visible: false,
-                layerType: 'cva_c',
-                isLoadMapByToken: true,
-                url: SINOPEC_GIS_HOST + '/OneMapServer/rest/services/base-tdt-label-vector/WMTS?'+
-                'layer=cva&style=default&tilematrixset=c&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}',
-                option:{
-                    maxZoom: 18,
-                    minZoom: 1,
-                    zoomOffset: 1
-                }
-            }
-        }
-    ],
-    InternetBaseMaps: [
-        {
-            code: 'tianditu_img',
-            name: '澶╁湴鍥惧奖鍍�',
-            icon_actived: '',
-            icon_deactived: '',
-            isAddToMap: true,
-            map: {
-                layerName: '澶╁湴鍥惧奖鍍忓湴鍥�',
-                type: 'wmts',
-                visible: false,
-                layerType: 'img_c',
-                isLoadMapByToken: true,
-                url: TIANDITU_GIS_HOST + '/img_c/wmts?layer=img&style=default&tilematrixset=c'+
-                '&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}'+
-                '&tk=' + TIANDITU_GIS_TOKEN,
-                option:{
-                    maxZoom: 18,
-                    minZoom: 1,
-                    zoomOffset: 1
-                }
-            },
-            annotation: {
-                layerName: '澶╁湴鍥惧奖鍍忔爣娉�',
-                type: 'wmts',
-                visible: false,
-                layerType: 'cia_c',
-                isLoadMapByToken: true,
-                url: TIANDITU_GIS_HOST + '/cia_c/wmts?layer=cia&style=default&tilematrixset=c'+
-                '&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}'+
-                '&tk=' + TIANDITU_GIS_TOKEN,
-                option:{
-                    maxZoom: 18,
-                    minZoom: 1,
-                    zoomOffset: 1
-                }
-            },
-        },
-        {
-            code: 'tianditu_vec',
-            name: '澶╁湴鍥惧奖鍍�',
-            icon_actived: '',
-            icon_deactived: '',
-            isAddToMap: false,
-            map: {
-                layerName: '澶╁湴鍥剧煝閲忓湴鍥�',
-                type: 'wmts',
-                visible: false,
-                layerType: 'vec_c',
-                isLoadMapByToken: true,
-                url: TIANDITU_GIS_HOST + '/vec_c/wmts?layer=vec&style=default&tilematrixset=c'+
-                '&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}'+
-                '&tk=' + TIANDITU_GIS_TOKEN,
-                option:{
-                    maxZoom: 18,
-                    minZoom: 1,
-                    zoomOffset: 1
-                }
-            },
-            annotation: {
-                layerName: '澶╁湴鍥剧煝閲忔爣娉�',
-                type: 'wmts',
-                visible: false,
-                layerType: 'cva_c',
-                isLoadMapByToken: true,
-                url: TIANDITU_GIS_HOST + '/cva_c/wmts?layer=cva&style=default&tilematrixset=c'+
-                '&Service=WMTS&Request=GetTile&Version=1.0.0&Format=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}'+
-                '&tk=' + TIANDITU_GIS_TOKEN,
-                option:{
-                    maxZoom: 18,
-                    minZoom: 1,
-                    zoomOffset: 1
-                }
-            }
-        }
-    ],
-    ArcBaseMaps: [
-        {
-            layerName: 'arcgis褰卞儚搴曞浘',
-            type: 'tile',
-            visible: true,
-            layerType: 'cia_c',
-            isLoadMapByToken: false,
-            url: SINOPEC_GIS_HOST + '/OneMapServer/rest/services/base-map-image-globe/MapServer'
-        }
-    ],
-
-    ServiceLayers:[
-        {
-            code:'guojie',
-            name:'鍥界晫',
-            icon_actived: '',
-            icon_deactived: '',
-            type:'wmts',
-            url: APP_GIS_HOST + '/server/ogcserver/whp_guojie/wmts?x={x}&y={y}&z={z}',
-            option:{
-                layers: 'all',
-                format: "image/png",
-                transparent: true,
-                crs: L.CRS.EPSG4326
-            }
-        }
-    ]
+  IsLoadMapByToken: true, // 鏄惁閫氳繃token鍔犺浇鍦板浘
+  showBaseMapType: 1, // 1鏄剧ず澶╁湴鍥撅紝2鏄剧ずarcgis鍦板浘
+  IntranetBaseMaps: TDT.intranet,
+  InternetBaseMaps: TDT.internet,
+  Layers: { LayerSewersLine: [LayerSewersLine], layerSewersPoint: LayerSewersPoint } // 姹¢洦姘村浘灞傞厤缃�
 }
 
 /**
  * 鍐呯綉GIS锛岃幏鍙杢oken鍙傛暟
  */
 const TokenConfig = {
-    url: SINOPEC_GIS_HOST + '/RemoteTokenServer', // 鑾峰彇token鐨勬湇鍔℃帴鍙�
-    option: {
-        request: 'getToken',
-        username: 'sipms', // 鑾峰彇token鐨勭敤鎴峰悕
-        password: 'sinopecipms', // 鑾峰彇token鐨勫瘑鐮�
-        expiration: 1440,
-        clientid: 'ref.' + HOST_URL// 鑾峰彇token鐨勫簲鐢ㄦ湇鍔″櫒鍦板潃
-    }
+  url: TDT.SINOPEC_GIS_HOST + '/RemoteTokenServer', // 鑾峰彇token鐨勬湇鍔℃帴鍙�
+  option: {
+    request: 'getToken',
+    username: 'sipms', // 鑾峰彇token鐨勭敤鎴峰悕
+    password: 'sinopecipms', // 鑾峰彇token鐨勫瘑鐮�
+    expiration: 1440,
+    clientid: 'ref.' + HOST_URL// 鑾峰彇token鐨勫簲鐢ㄦ湇鍔″櫒鍦板潃
+  }
 }
 
 export default {
-    mapOptions,
-    mapConfig,
-    TokenConfig,
-
-    BLUEMAP_HOST
+  mapOptions,
+  mapConfig,
+  TokenConfig,
+  BLUEMAP_HOST
 }

--
Gitblit v1.8.0