From e911c5fa1f968f5bb88d1ea3f893e285249c5933 Mon Sep 17 00:00:00 2001
From: liuyg <liuyg@qq.com>
Date: Tue, 22 Mar 2022 09:51:45 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/school-web
---
src/components/map/index.vue | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/components/map/index.vue b/src/components/map/index.vue
index 5534257..f59faf6 100644
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
@@ -164,8 +164,6 @@
mounted () {
var that = this
- let eagleViewer
-
function distanceSurface () {
global.viewer.measure.distanceSurface()
}
@@ -249,7 +247,7 @@
that.$store.commit('SET_VIEWEREXIST', true)
- eagleViewer = new global.DC.Viewer('eagleEyeMap', {
+ global.eagleViewer = new global.DC.Viewer('eagleEyeMap', {
animation: false,
baseLayerPicker: false,
imageryProvider: false,
@@ -266,7 +264,7 @@
// sceneMode: global.DC.Namespace.Cesium.SceneMode.SCENE2D
})
- eagleViewer.imageryLayers.addImageryProvider(
+ global.eagleViewer.imageryLayers.addImageryProvider(
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'],
@@ -276,7 +274,7 @@
})
)
- eagleViewer.imageryLayers.addImageryProvider(
+ global.eagleViewer.imageryLayers.addImageryProvider(
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'],
@@ -287,7 +285,7 @@
)
var sceneL = global.viewer.scene
- var sceneR = eagleViewer.scene
+ var sceneR = global.eagleViewer.scene
var handlerL = new global.DC.Namespace.Cesium.ScreenSpaceEventHandler(sceneL.canvas)
var handlerR = new global.DC.Namespace.Cesium.ScreenSpaceEventHandler(sceneR.canvas)
@@ -312,7 +310,7 @@
if (isLeftTrigger) {
const position = global.DC.Transform.transformCartesianToWGS84(global.viewer.camera.position)
- eagleViewer.camera.flyTo({
+ global.eagleViewer.camera.flyTo({
destination: global.DC.Transform.transformWGS84ToCartesian(new global.DC.Position(position.lng, position.lat, position.alt + 1000)),
@@ -338,17 +336,19 @@
var synceagleViewer = function () {
if (isRightTrigger && that.samllMapFlag) {
+ const position = global.DC.Transform.transformCartesianToWGS84(global.eagleViewer.camera.position)
+
global.viewer.camera.flyTo({
- destination: eagleViewer.camera.position,
+ destination: global.DC.Transform.transformWGS84ToCartesian(new global.DC.Position(position.lng, position.lat, position.alt > 1100 ? position.alt - 1000 : 100)),
orientation: {
- heading: eagleViewer.camera.heading,
+ heading: global.eagleViewer.camera.heading,
- pitch: eagleViewer.camera.pitch,
+ pitch: global.eagleViewer.camera.pitch,
- roll: eagleViewer.camera.roll
+ roll: global.eagleViewer.camera.roll
},
@@ -358,7 +358,7 @@
}
}
- eagleViewer.camera.setView({
+ global.eagleViewer.camera.setView({
// Cesium的坐标是以地心为原点，一向指向南美洲，一向指向亚洲，一向指向北极州
// fromDegrees()方法，将经纬度和高程转换为世界坐标
destination: global.DC.Namespace.Cesium.Cartesian3.fromDegrees(
@@ -373,9 +373,9 @@
}
})
- eagleViewer.camera.changed.addEventListener(synceagleViewer)
+ global.eagleViewer.camera.changed.addEventListener(synceagleViewer)
- eagleViewer.scene.preRender.addEventListener(synceagleViewer)
+ global.eagleViewer.scene.preRender.addEventListener(synceagleViewer)
// global.viewer.camera.percentageChanged = 0.01
// eagleViewer.camera.percentageChanged = 0.01
--
Gitblit v1.9.3