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

chenyabin

2021-04-12 de01693a063433610388fab33cd4927f2f663e60

 src/conf/MapConfig.js

@@ -1,9 +1,7 @@
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 { LayerTopic } from './LayerTopic'
import { LayerBasin } from './layers/LayerBasin'

const curWwwPath = window.document.location.href
const pathname = window.document.location.pathname
@@ -26,7 +24,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,8 +41,7 @@
  IntranetBaseMaps: TDT.intranet,
  InternetBaseMaps: TDT.internet,
  Layers: {
    LayerSewersLine: [LayerSewersLine, LayerWasteWater, LayerWasteGas, LayerSolidWaste],
    layerSewersPoint: LayerSewersPoint
    LayerSewersLine: [LayerBasin, LayerTopic]
  } // 污雨水图层配置
}

@@ -83,5 +81,6 @@
  mapConfig,
  TokenConfig,
  BLUEMAP_HOST
  // mapTokenArray
  // MagicMaker
}