From b5919ce577d2106eb8294e74160cda5c61feb4a8 Mon Sep 17 00:00:00 2001
From: ansel0926 <ansel0926@gmail.com>
Date: 星期二, 17 五月 2022 18:43:53 +0800
Subject: [PATCH] Merge branch 'master' of ssh://117.78.1.188:29418/DDE-WEB
---
libs/Cesiumplus/CesiumDraw.js | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 52 insertions(+), 5 deletions(-)
diff --git a/libs/Cesiumplus/CesiumDraw.js b/libs/Cesiumplus/CesiumDraw.js
index b649303..f9a7cf9 100644
--- a/libs/Cesiumplus/CesiumDraw.js
+++ b/libs/Cesiumplus/CesiumDraw.js
@@ -169,7 +169,8 @@
outlineColor: Cesium.Color.WHITE,
hierarchy: new Cesium.CallbackProperty(function () {
return polygon;
- }, false)
+ }, false),
+ distanceDisplayCondition: new Cesium.DistanceDisplayCondition(0, 10000000.0)
}
});
@@ -314,6 +315,7 @@
clampToGround: true,
width: 1,
material: options.polylinecolor,
+ distanceDisplayCondition: new Cesium.DistanceDisplayCondition(0, 10000000.0)
},
drawpointArr: [],
measureLinePositonsArray: measureLinePositonsArray
@@ -473,6 +475,7 @@
//鑾峰彇榧犳爣鐐瑰嚮澶勭殑鍧愭爣
drawHandler = drawHandler && drawHandler.destroy();
let position = viewer.scene.camera.pickEllipsoid(movement.position, viewer.scene.globe.ellipsoid);
+ position = viewer.scene.pickPosition(movement.position);
let pointText="鐐�" + new Date().format("yyyyMMddhhmmss");
var entity=viewer.entities.add({
name:"drawPointEntity",
@@ -484,9 +487,10 @@
font: '10px SimSun',
fillColor: Cesium.Color.WHITE,
text: pointText,
+ eyeOffset:new Cesium.Cartesian3(0,20,0),
disableDepthTestDistance: Number.POSITIVE_INFINITY,
heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
- distanceDisplayCondition: new Cesium.DistanceDisplayCondition(0, 200000000.0)
+ distanceDisplayCondition: window.localStorage.getItem("visualDistance")?new Cesium.DistanceDisplayCondition(0, window.localStorage.getItem("visualDistance")):new Cesium.DistanceDisplayCondition(0, 100000.0)
},
billboard: {
image: "../assets/images/icon/icon1.png",
@@ -497,7 +501,7 @@
horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
disableDepthTestDistance: Number.POSITIVE_INFINITY,//骞垮憡鐗屼笉杩涜娣卞害妫�娴�
heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
- distanceDisplayCondition: new Cesium.DistanceDisplayCondition(0, 200000000.0)
+ distanceDisplayCondition: window.localStorage.getItem("visualDistance")?new Cesium.DistanceDisplayCondition(0, window.localStorage.getItem("visualDistance")):new Cesium.DistanceDisplayCondition(0, 100000.0)
}
});
entity.title = pointText;
@@ -533,6 +537,7 @@
//鑾峰彇榧犳爣鐐瑰嚮澶勭殑鍧愭爣
drawHandler = drawHandler && drawHandler.destroy();
let position = viewer.scene.camera.pickEllipsoid(movement.position, viewer.scene.globe.ellipsoid);
+ position = viewer.scene.pickPosition(movement.position);
let labelText="鏂囧瓧" + new Date().format("yyyyMMddhhmmss");
var entity=viewer.entities.add({
name:"drawLabelEntity",
@@ -544,9 +549,10 @@
font: '30px SimSun',
fillColor: Cesium.Color.WHITE,
text: labelText,
+ eyeOffset:new Cesium.Cartesian3(0,20,0),
disableDepthTestDistance: Number.POSITIVE_INFINITY,
heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
- distanceDisplayCondition: new Cesium.DistanceDisplayCondition(0, 200000000.0)
+ distanceDisplayCondition: window.localStorage.getItem("visualDistance")?new Cesium.DistanceDisplayCondition(0, window.localStorage.getItem("visualDistance")):new Cesium.DistanceDisplayCondition(0, 100000.0)
},
billboard: {
image: "../assets/images/icon/icon1.png",
@@ -557,7 +563,7 @@
horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
disableDepthTestDistance: Number.POSITIVE_INFINITY,//骞垮憡鐗屼笉杩涜娣卞害妫�娴�
heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
- distanceDisplayCondition: new Cesium.DistanceDisplayCondition(0, 200000000.0)
+ distanceDisplayCondition: window.localStorage.getItem("visualDistance")?new Cesium.DistanceDisplayCondition(0, window.localStorage.getItem("visualDistance")):new Cesium.DistanceDisplayCondition(0, 100000.0)
}
});
entity.title = labelText;
@@ -586,6 +592,47 @@
}, Cesium.ScreenSpaceEventType.LEFT_CLICK);
}
+ CesiumDraw.drawText = function (options) {
+ drawHandler = drawHandler && drawHandler.destroy();
+ drawHandler = new Cesium.ScreenSpaceEventHandler(options.viewer.scene.canvas);
+ drawHandler.setInputAction(function (movement) {
+ let position = viewer.scene.pickPosition(movement.position);
+ let labelText="鏍囩" + new Date().format("yyyyMMddhhmmss");
+ var entity=viewer.entities.add({
+ name:"drawTextEtity",
+ position:position,
+ label: {
+ show: true,
+ verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+ horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
+ font: '20px LiSu',
+ fillColor: Cesium.Color.YELLOW,
+ text: labelText,
+ eyeOffset:new Cesium.Cartesian3(0,20,0),
+ disableDepthTestDistance: Number.POSITIVE_INFINITY,
+ heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
+ distanceDisplayCondition: window.localStorage.getItem("visualDistance")?new Cesium.DistanceDisplayCondition(0, window.localStorage.getItem("visualDistance")):new Cesium.DistanceDisplayCondition(0, 100000.0)
+ },
+ });
+ entity.title = labelText;
+ var cartesian = entity._position._value
+ addTreeNode({
+ "title": entity.title,
+ "id": entity.id,
+ "field": "Entity",
+ "checked": true,
+ "spread": true,
+ "children": [],
+ "ext": {
+ "lng": Cesium.Math.toDegrees(cartesian.x),
+ "lat": Cesium.Math.toDegrees(cartesian.y)
+ }
+ }, "4");
+ saveDrawEntity("text",entity,entity.id);
+ drawHandler = drawHandler && drawHandler.destroy();
+ }, Cesium.ScreenSpaceEventType.LEFT_CLICK);
+ }
+
CesiumDraw.clearDraw = function (options) {
}
--
Gitblit v1.9.1