From e8e7b70168d5cc8a465c92da28bdcce52e8bf3cc Mon Sep 17 00:00:00 2001
From: liuyg <liuyg@qq.com>
Date: Thu, 10 Mar 2022 14:48:21 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/school-web
---
src/components/map/index.vue | 83 ++++++++++++++++++-----------------------
1 files changed, 37 insertions(+), 46 deletions(-)
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index a66db66..2afb835 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -66,7 +66,6 @@
},
data () {
return {
- DC: null,
areaLayer: null,
samllMapFlag: false
}
@@ -165,8 +164,6 @@
let viewer, eagleViewer
- that.DC = global.DC
-
function distanceSurface () {
viewer.measure.distanceSurface()
}
@@ -222,7 +219,7 @@
}
function initViewer () {
- viewer = new that.DC.Viewer('viewer-container', {
+ viewer = new global.DC.Viewer('viewer-container', {
contextOptions: {
webgl: {
stencil: true,
@@ -231,7 +228,7 @@
}
})
- eagleViewer = new that.DC.Viewer('eagleEyeMap', {
+ eagleViewer = new global.DC.Viewer('eagleEyeMap', {
animation: false,
baseLayerPicker: false,
imageryProvider: false,
@@ -245,30 +242,24 @@
navigationHelpButton: false,
navigationInstructionsInitiallyVisible: false,
creditContainer: undefined
- // sceneMode: that.DC.Namespace.Cesium.SceneMode.SCENE2D
+ // sceneMode: global.DC.Namespace.Cesium.SceneMode.SCENE2D
})
eagleViewer.imageryLayers.addImageryProvider(
- new that.DC.Namespace.Cesium.WebMapTileServiceImageryProvider({
- url: ' http://t1.tianditu.gov.cn/vec_w/wmts?tk=9ae78c51a0a28f06444d541148496e36',
- type: 'wmts',
- layer: 'vec',
- style: 'default',
- format: 'tiles',
- tileMatrixSetID: 'w',
+ new global.DC.Namespace.Cesium.UrlTemplateImageryProvider({
+ url: 'http://t{s}.tianditu.gov.cn/DataServer?T=vec_w&x={x}&y={y}&l={z}&tk=9ae78c51a0a28f06444d541148496e36',
+ subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'],
+ format: 'image/jpeg',
show: true,
maximumLevel: 18
})
)
eagleViewer.imageryLayers.addImageryProvider(
- new that.DC.Namespace.Cesium.WebMapTileServiceImageryProvider({
- url: ' http://t1.tianditu.gov.cn/cva_w/wmts?tk=9ae78c51a0a28f06444d541148496e36',
- type: 'wmts',
- layer: 'cva',
- style: 'default',
- format: 'tiles',
- tileMatrixSetID: 'w',
+ new global.DC.Namespace.Cesium.UrlTemplateImageryProvider({
+ url: 'http://t{s}.tianditu.gov.cn/DataServer?T=cva_w&x={x}&y={y}&l={z}&tk=9ae78c51a0a28f06444d541148496e36',
+ subdomains: ['0', '1', '2', '3', '4', '5', '6', '7'],
+ format: 'image/jpeg',
show: true,
maximumLevel: 18
})
@@ -277,8 +268,8 @@
var sceneL = viewer.scene
var sceneR = eagleViewer.scene
- var handlerL = new that.DC.Namespace.Cesium.ScreenSpaceEventHandler(sceneL.canvas)
- var handlerR = new that.DC.Namespace.Cesium.ScreenSpaceEventHandler(sceneR.canvas)
+ var handlerL = new global.DC.Namespace.Cesium.ScreenSpaceEventHandler(sceneL.canvas)
+ var handlerR = new global.DC.Namespace.Cesium.ScreenSpaceEventHandler(sceneR.canvas)
var isLeftTrigger = false
@@ -287,22 +278,22 @@
handlerL.setInputAction(function (movement) {
isLeftTrigger = true
isRightTrigger = false
- }, that.DC.Namespace.Cesium.ScreenSpaceEventType.MOUSE_MOVE)
+ }, global.DC.Namespace.Cesium.ScreenSpaceEventType.MOUSE_MOVE)
handlerR.setInputAction(function (movement) {
if (that.samllMapFlag) {
isLeftTrigger = false
isRightTrigger = true
}
- }, that.DC.Namespace.Cesium.ScreenSpaceEventType.MOUSE_MOVE)
+ }, global.DC.Namespace.Cesium.ScreenSpaceEventType.MOUSE_MOVE)
var syncviewer = function () {
if (isLeftTrigger) {
- const position = that.DC.Transform.transformCartesianToWGS84(viewer.camera.position)
+ const position = global.DC.Transform.transformCartesianToWGS84(viewer.camera.position)
eagleViewer.camera.flyTo({
- destination: that.DC.Transform.transformWGS84ToCartesian(new that.DC.Position(position.lng, position.lat, position.alt + 1000)),
+ destination: global.DC.Transform.transformWGS84ToCartesian(new global.DC.Position(position.lng, position.lat, position.alt + 1000)),
orientation: {
@@ -349,14 +340,14 @@
eagleViewer.camera.setView({
// Cesium的坐标是以地心为原点，一向指向南美洲，一向指向亚洲，一向指向北极州
// fromDegrees()方法，将经纬度和高程转换为世界坐标
- destination: that.DC.Namespace.Cesium.Cartesian3.fromDegrees(
+ destination: global.DC.Namespace.Cesium.Cartesian3.fromDegrees(
115.871863, 28.743861, 1400.0
),
orientation: {
// 指向
- heading: that.DC.Namespace.Cesium.Math.toRadians(0, 0),
+ heading: global.DC.Namespace.Cesium.Math.toRadians(0, 0),
// 视角
- pitch: that.DC.Namespace.Cesium.Math.toRadians(-90),
+ pitch: global.DC.Namespace.Cesium.Math.toRadians(-90),
roll: 0.0
}
})
@@ -399,16 +390,16 @@
that.$refs.leftNav.initialize(viewer)
// const key = '0f7c1d161d7352116a21aacf0e9f44c1'
- // const vec = that.DC.ImageryLayerFactory.createTdtImageryLayer({
+ // const vec = global.DC.ImageryLayerFactory.createTdtImageryLayer({
// key
// })
- // const cva = that.DC.ImageryLayerFactory.createTdtImageryLayer({
+ // const cva = global.DC.ImageryLayerFactory.createTdtImageryLayer({
// key,
// style: 'cva'
// })
// viewer.addBaseLayer([vec, cva])
- // const areaLayer = new that.DC.VectorLayer('areaLayer')
+ // const areaLayer = new global.DC.VectorLayer('areaLayer')
// viewer.addLayer(areaLayer)
@@ -420,11 +411,11 @@
// item.geometry.rings[0] = item.geometry.rings[0].join(';')
- // const polygon = new that.DC.Polygon(item.geometry.rings[0])
+ // const polygon = new global.DC.Polygon(item.geometry.rings[0])
// polygon.setStyle({
- // material: that.DC.Namespace.Cesium.Color.fromBytes(255, 255, 255, 0)
+ // material: global.DC.Namespace.Cesium.Color.fromBytes(255, 255, 255, 0)
// })
@@ -437,7 +428,7 @@
// color: undefined
// }
- // viewer.on(that.DC.MouseEventType.MOUSE_MOVE, e => {
+ // viewer.on(global.DC.MouseEventType.MOUSE_MOVE, e => {
// if (e.overlay != undefined) {
// if (select.overlay != undefined) {
// if (e.overlay != select.overlay) {
@@ -456,7 +447,7 @@
// select.color = e.overlay._style.material
// select.overlay.setStyle({
- // material: that.DC.Namespace.Cesium.Color.fromBytes(32, 108, 247, 158)
+ // material: global.DC.Namespace.Cesium.Color.fromBytes(32, 108, 247, 158)
// })
// }
@@ -472,7 +463,7 @@
// }
// })
- // viewer.on(that.DC.MouseEventType.CLICK, e => {
+ // viewer.on(global.DC.MouseEventType.CLICK, e => {
// if (e.overlay != undefined) {
// console.log(e.overlay.attr)
// }
@@ -489,7 +480,7 @@
// })
// // eslint-disable-next-line camelcase
- // const baselayer_shaded = that.DC.ImageryLayerFactory.createArcGisImageryLayer({
+ // const baselayer_shaded = global.DC.ImageryLayerFactory.createArcGisImageryLayer({
// url:
// 'http://services.arcgisonline.com/arcgis/rest/services/World_Shaded_Relief/MapServer'
// })
@@ -499,7 +490,7 @@
// })
// // eslint-disable-next-line camelcase
- // const baselayer_street = that.DC.ImageryLayerFactory.createArcGisImageryLayer({
+ // const baselayer_street = global.DC.ImageryLayerFactory.createArcGisImageryLayer({
// url:
// 'http://services.arcgisonline.com/arcgis/rest/services/World_Physical_Map/MapServer'
// })
@@ -509,7 +500,7 @@
// })
// // eslint-disable-next-line camelcase
- // const baselayer_ter = that.DC.ImageryLayerFactory.createArcGisImageryLayer({
+ // const baselayer_ter = global.DC.ImageryLayerFactory.createArcGisImageryLayer({
// url:
// 'http://services.arcgisonline.com/arcgis/rest/services/World_Terrain_Base/MapServer'
// })
@@ -518,10 +509,10 @@
// name: '地形'
// })
- viewer.use(new that.DC.Measure())
+ viewer.use(new global.DC.Measure())
// viewer.flyToPosition(
- // new that.DC.Position(117.08489820, 31.65413916, 1500, 0, -90, 45)
+ // new global.DC.Position(117.08489820, 31.65413916, 1500, 0, -90, 45)
// )
viewer.compass.enable = true
@@ -531,14 +522,14 @@
// DC的鹰眼地图
// viewer.hawkeyeMap.enable = true
// viewer.hawkeyeMap.addBaseLayer(
- // that.DC.ImageryLayerFactory.createAmapImageryLayer({
+ // global.DC.ImageryLayerFactory.createAmapImageryLayer({
// crs: 'WGS84'
// })
// )
// viewer.distanceLegend.enable = true
}
- that.DC.ready(initViewer)
+ global.DC.ready(initViewer)
},
methods: {
mapClick (e) {
@@ -547,10 +538,10 @@
},
createdLayers (viewer) {
- const layerGroup = new this.DC.LayerGroup('modelBox')
+ const layerGroup = new global.DC.LayerGroup('modelBox')
viewer.addLayerGroup(layerGroup)
- this.areaLayer = new this.DC.VectorLayer('areaLayer')
+ this.areaLayer = new global.DC.VectorLayer('areaLayer')
layerGroup.addLayer(this.areaLayer)
}
}
--
Gitblit v1.9.3