Merge remote-tracking branch 'origin/develop' into develop

chenyabin

2021-04-07 cd80929f0ae8882a98cfe3936b2a96bded1c12d8

 src/conf/MapConfig.js

@@ -1,9 +1,9 @@
import * as L from 'leaflet'
import TDT from './TDT'
import { LayerSewersLine, LayerSewersPoint } from './layers/LayerSewers'
import { LayerWasteWater } from './layers/LayerWasteWater'
import { LayerSolidWaste } from './layers/LayerSolidWaste'
import { LayerWasteGas } from './layers/LayerWasteGas'
import { LayerSewersPoint } from './layers/LayerSewers'
import { LayerTopic } from './LayerTopic'
import { LayerPipeLine } from './LayerPipeLine'
import { LayerBasin } from './layers/LayerBasin'

const curWwwPath = window.document.location.href
const pathname = window.document.location.pathname
@@ -26,7 +26,8 @@
  maxZoom: 18,
  // center: [26, 104],
  center: [38.828558921813965, 117.41676807403564],
  zoom: 14,
  // center: [29.454345703125, 113.40362548828125],
  zoom: 5,
  worldCopyJump: true,
  inertia: true,
  zoomControl: false,
@@ -42,11 +43,15 @@
  IntranetBaseMaps: TDT.intranet,
  InternetBaseMaps: TDT.internet,
  Layers: {
    LayerSewersLine: [LayerSewersLine, LayerWasteWater, LayerWasteWater, LayerWasteGas, LayerSolidWaste],
    LayerSewersLine: [LayerBasin, LayerTopic, LayerPipeLine],
    layerSewersPoint: LayerSewersPoint
  } // 污雨水图层配置
}

const mapTokenArray = ['5d76218063082952d18b76da5005f490',
  'f1b72b5e7cb1175acddfa485f1bc9770',
  'ac8bbce8119b337d75d4b06696f6186d',
  '9bf834ce1ba3ba01c568147e9bfcab7c']
/**
 * 内网GIS，获取token参数
 */
@@ -82,6 +87,7 @@
  mapOptions,
  mapConfig,
  TokenConfig,
  BLUEMAP_HOST
  BLUEMAP_HOST,
  mapTokenArray
  // MagicMaker
}