From 25ce610f6ecca7325e7a743dc032c4a76559c63d Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Fri, 02 Jul 2021 09:10:26 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/pyhmap
---
widgets/digTheEarth/Widget.js | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/widgets/digTheEarth/Widget.js b/widgets/digTheEarth/Widget.js
index ad787cd..4cafa8e 100644
--- a/widgets/digTheEarth/Widget.js
+++ b/widgets/digTheEarth/Widget.js
@@ -27,8 +27,8 @@
that.closesDigTheEarth();
})
- $("#beginigTheEarth").click(()=>{
- that.beginDigTheEarth();
+ $("#beginigTheEarth").click(() => {
+ that.beginDigTheEarth();
})
},
@@ -52,8 +52,9 @@
// roll: 6.2831853016686185
// }
// });
-
+
var tooltip = window.MYcreateTooltip(viewer._element);
+ // console.log(viewer._element, 534)
//绘制多边形
var handlerPolygon = new Cesium.DrawHandler(viewer, Cesium.DrawMode.Polygon, 0);
handlerPolygon.activeEvt.addEventListener(function (isActive) {
@@ -68,6 +69,9 @@
}
});
handlerPolygon.movingEvt.addEventListener(function (windowPosition) {
+ // console.log(windowPosition,534)
+ // console.log(handlerPolygon.isDrawing,555)
+ // console.log(viewer._element, 534)
if (windowPosition.x < 200 && windowPosition.y < 150) {
tooltip.setVisible(false);
return;
@@ -126,6 +130,7 @@
// }
// handlerPolygon.polygon.show = false;
// handlerPolygon.polyline.show = false;
+
that.closesDigTheEarth();
};
@@ -135,8 +140,10 @@
$('#toolbardigTheEarth').show();
$('#loadingbar').remove();
that.handlerPolygon = handlerPolygon;
+ that.tooltip = tooltip;
},
handlerPolygon: '',
+ tooltip: '',
closesDigTheEarth: function () {
// console.log('gaunbi');
var that = this;
@@ -147,8 +154,12 @@
if (that.handlerPolygon.polyline) {
that.handlerPolygon.polyline.show = false;
}
- that.handlerPolygon.deactivate();
-
+ if (that.handlerPolygon.deactivate) {
+ that.handlerPolygon.deactivate();
+ }
+ if(that.tooltip.setVisible){
+ that.tooltip.setVisible(false);
+ }
},
onOpen: function () {
--
Gitblit v1.9.3