From 723428353fa3c857f36e9db3c80c92530b6ee444 Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期五, 09 四月 2021 11:10:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/views/Temp.vue | 42 ++++++++++++++++++++++++++++++++++--------
src/Sgis.js | 6 +++---
2 files changed, 37 insertions(+), 11 deletions(-)
diff --git a/src/Sgis.js b/src/Sgis.js
index 6682108..3104d7e 100644
--- a/src/Sgis.js
+++ b/src/Sgis.js
@@ -20,13 +20,13 @@
let map = null
const L = window.L
-const initMap = (div) => {
+const initMap = (div, mapOption) => {
if (map != null) {
map.remove()
}
DownLoad.init(L)
-
- map = L.map(div, MapConfig.mapOptions)
+ const option = mapOption || MapConfig.mapOptions
+ map = L.map(div, option)
map.on('click', (event, a, b) => {
console.log(event, a, b)
diff --git a/src/views/Temp.vue b/src/views/Temp.vue
index 130740e..c60d3de 100644
--- a/src/views/Temp.vue
+++ b/src/views/Temp.vue
@@ -35,6 +35,9 @@
// // 鍏叡灞曠ず鏁版嵁
import PublicBounced from '@components/BaseNav/PublicBounced/PublicBounced'
import LayerFactory from '@components/LayerController/service/LayerFactory'
+// import '../components/plugin/Leaflet.TileLayer.ProjWMTS'
+// import * as L from 'leaflet'
+// import * as L from 'leaflet'
const esri = require('esri-leaflet')
// const proj4 = require('proj4')
const proj4 = require('proj4')
@@ -88,7 +91,7 @@
const mapcontainer = this.$refs.rootmap
const CRS_4490 = new Proj.CRS('EPSG:4490', '+proj=longlat +ellps=GRS80 +no_defs', {
resolutions: [
- 1.40625,
+ // 1.40625,
0.703125,
0.3515625,
0.17578125,
@@ -110,12 +113,30 @@
2.682209064925356E-6,
1.3411045324626732E-6
],
- origin: [-180, 90]
+ origin: [-180, 90],
+ // origin: [-400.0, 399.9999999999998],//arcgis 鍧愭爣婧愮偣
+ bounds: this.L.bounds([-180, -90], [180, 90]) // 澶╁湴鍥�
+
})
console.log(mapcontainer)
console.log(CRS_4490)
- debugger
- this.map = Sgis.initMap(mapcontainer)
+ const options = {
+ crs: CRS_4490,
+ // crs: this.L.CRS.EPSG4326,
+ minZoom: 3,
+ maxZoom: 21,
+ // center: [26, 104],
+ center: [32.23012597374691, 118.78516085275147],
+ // center: [29.454345703125, 113.40362548828125],
+ zoom: 3,
+ worldCopyJump: false,
+ inertia: true,
+ zoomControl: false,
+ attributionControl: false,
+ editable: true,
+ preferCanvas: true
+ }
+ this.map = Sgis.initMap(mapcontainer, options)
this.$refs.toolBox.map = this.map
window.popupComp = this.$refs.popup
@@ -127,7 +148,7 @@
window.layerFactory = layerFactory
this.basemapHelper = Sgis.initBasemapsHelper(this.map) // 鍒濆鍖栧熀纭�搴曞浘鍔╂墜
- this.basemapHelper.initBasemap(this.config, false) // 绗簩涓弬鏁帮紝琛ㄧず鏄惁鍐呯綉搴曞浘
+ this.basemapHelper.initBasemap(this.config, true) // 绗簩涓弬鏁帮紝琛ㄧず鏄惁鍐呯綉搴曞浘
// this.vectorLayerHelper = Sgis.initVectorLayersHelper(this.map) // 鍒濆鍖栧姩鎬佽绱犲浘灞傚姪鎵�
// this.vectorLayerHelper.initVectorLayers(this.config)
@@ -143,10 +164,15 @@
},
loadArcgisImg () {
// const url = 'http://10.246.132.249:8080/OneMapServer/rest/services/base-map-image-enterprise/MapServer/tile/{z}/{y}/{x}'
- const url = 'http://10.246.132.249:8080/OneMapServer/rest/services/base-map-image-enterprise/MapServer'
+ // const url = 'http://10.246.132.249:8080/OneMapServer/rest/services/base-map-image-enterprise/MapServer'
+ const url = 'http://10.246.132.249:8080/OneMapServer/rest/services/base-map-image-sinopec/MapServer'
// const arcgisTileLayer = this.L.tileLayer(url, {
- const arcgisTileLayer = esri.tiledMapLayer({ url: url })
- // const arcgisTileLayer = esri.dynamicMapLayer({ url: url })
+ const arcgisTileLayer = esri.tiledMapLayer({
+ url: url,
+ token: window.tdtToken,
+ zoomOffsetAllowance: 0.5
+ })
+ // const arcgisTileLayer = esri.dynamicMapLayer({ url: url, useCors: true })
arcgisTileLayer.addTo(this.map)
},
onLayerClick () {
--
Gitblit v1.8.0