-
油耗
-
-
- L/100km
-
-
+
+
+ 视野缩放
+
+
+
+
最近距离
+
+
+ m
+
-
- 总油耗
-
+
+
-
- `
+
+
+ `
}
export { html }
diff --git a/src/Obj/Base/TrajectoryMotion/index.js b/src/Obj/Base/TrajectoryMotion/index.js
index aefb9dc..e02a63a 100644
--- a/src/Obj/Base/TrajectoryMotion/index.js
+++ b/src/Obj/Base/TrajectoryMotion/index.js
@@ -78,7 +78,6 @@ class TrajectoryMotion extends Base {
this.options.line.smooth = options.line.smooth ? options.line.smooth : false
this.options.line.noseToTail = options.line.noseToTail ? options.line.noseToTail : false
this.positions_smooth = []
- this.options.unitFuelConsumption = options.unitFuelConsumption || 0
this.options.ground = options.ground || false
this.options.state = (options.state || options.state === false) ? options.state : true
this.options.routeDirection = (options.routeDirection || options.routeDirection === false) ? options.routeDirection : true
@@ -181,8 +180,7 @@ class TrajectoryMotion extends Base {
if (this.realTimeRoute) {
this.realTimeLine && (this.realTimeLine.show = (!this.showView || this.showView == 3 || !sdkD) ? true : false)
}
- this.label && (this.label.show = (!this.showView || this.showView == 3) ? this.options.label.show : false)
- this.fuelLabel && (this.fuelLabel.show = (!this.showView || this.showView == 3) ? this.options.fuelShow : false)
+ this.label && (this.label.show = (!this.showView || this.showView == 3 || !sdkD) ? this.options.label.show : false)
}
else {
this.model.show = (!this.showView || this.showView == 3 || !sdkD) ? this.options.show : false
@@ -205,7 +203,6 @@ class TrajectoryMotion extends Base {
this.keyPoints[i].show = (!this.showView || this.showView == 3) ? show : false
}
this.label && (this.label.show = false)
- this.fuelLabel && (this.fuelLabel.show = false)
this.viewFollow = false
}
@@ -260,17 +257,14 @@ class TrajectoryMotion extends Base {
// Cesium.Matrix4.multiplyByTranslation(this.model.modelMatrix, new Cesium.Cartesian3(0, 0, -difference), this.model.modelMatrix)
// Cesium.Matrix4.getTranslation(this.model.modelMatrix, this.model.position)
this.label && (this.label.show = this.label.show)
- this.fuelLabel && (this.fuelLabel.show = this.fuelLabel.show)
if (this.options.label.position) {
setTimeout(() => {
if (this.options.label.position.alt) {
this.label && (this.label.position = [this.options.label.position.lng, this.options.label.position.lat, this.options.label.position.alt])
- this.fuelLabel && (this.fuelLabel.position = [this.options.label.position.lng, this.options.label.position.lat, this.options.label.position.alt])
}
else {
this.getClampToHeight({ lng: this.options.label.position.lng, lat: this.options.label.position.lat }).then((height) => {
this.label && (this.label.position = [this.options.label.position.lng, this.options.label.position.lat, height])
- this.fuelLabel && (this.fuelLabel.position = [this.options.label.position.lng, this.options.label.position.lat, height])
})
}
}, 0)
@@ -1174,21 +1168,18 @@ class TrajectoryMotion extends Base {
show = false
}
if (this.show) {
- if (this.label) {
- this.label.show = show
- this.label.pixelOffset = this.options.label.pixelOffset + (this.fuelShow ? this.labelFontSize + 20 : 0)
- if (this.options.label.position) {
- setTimeout(() => {
- if (this.options.label.position.alt) {
- this.label && (this.label.position = [this.options.label.position.lng, this.options.label.position.lat, this.options.label.position.alt])
- }
- else {
- this.getClampToHeight({ lng: this.options.label.position.lng, lat: this.options.label.position.lat }).then((height) => {
- this.label && (this.label.position = [this.options.label.position.lng, this.options.label.position.lat, height])
- })
- }
- }, 0);
- }
+ this.label && (this.label.show = show)
+ if (this.options.label.position) {
+ setTimeout(() => {
+ if (this.options.label.position.alt) {
+ this.label && (this.label.position = [this.options.label.position.lng, this.options.label.position.lat, this.options.label.position.alt])
+ }
+ else {
+ this.getClampToHeight({ lng: this.options.label.position.lng, lat: this.options.label.position.lat }).then((height) => {
+ this.label && (this.label.position = [this.options.label.position.lng, this.options.label.position.lat, height])
+ })
+ }
+ }, 0);
}
}
else {
@@ -1206,7 +1197,6 @@ class TrajectoryMotion extends Base {
set labelFontFamily(v) {
this.options.label.fontFamily = v || 0
this.label && (this.label.fontFamily = this.options.label.fontFamily)
- this.fuelLabel && (this.fuelLabel.fontFamily = this.options.label.fontFamily)
let name = getFontFamilyName(this.labelFontFamily) || ''
this._elms.labelFontFamily &&
@@ -1221,7 +1211,6 @@ class TrajectoryMotion extends Base {
set labelColor(v) {
this.options.label.color = v
this.label && (this.label.color = v)
- this.fuelLabel && (this.fuelLabel.color = v)
if (this._elms.labelColor) {
this._elms.labelColor.forEach((item, i) => {
let labelColorPicker = new YJColorPicker({
@@ -1249,13 +1238,6 @@ class TrajectoryMotion extends Base {
set labelFontSize(v) {
this.options.label.fontSize = v
this.label && (this.label.fontSize = v)
- if (this.fuelLabel) {
- this.fuelLabel.fontSize = v
- this.label.pixelOffset = this.options.label.pixelOffset + v + 20
- }
- else {
- this.label.pixelOffset = this.options.label.pixelOffset
- }
this._elms.labelFontSize && this._elms.labelFontSize.forEach((item) => {
item.value = v
})
@@ -1267,7 +1249,6 @@ class TrajectoryMotion extends Base {
set labelScaleByDistance(v) {
this.options.label.scaleByDistance = v
this.label && (this.label.scaleByDistance = v)
- this.fuelLabel && (this.fuelLabel.scaleByDistance = v)
this._elms.labelScaleByDistance && this._elms.labelScaleByDistance.forEach((item) => {
item.checked = v
})
@@ -1283,7 +1264,6 @@ class TrajectoryMotion extends Base {
}
this.options.label.near = near
this.label && (this.label.near = near)
- this.fuelLabel && (this.fuelLabel.near = near)
this._elms.labelNear && this._elms.labelNear.forEach((item) => {
item.value = near
})
@@ -1299,66 +1279,11 @@ class TrajectoryMotion extends Base {
}
this.options.label.far = far
this.label && (this.label.far = far)
- this.fuelLabel && (this.fuelLabel.far = far)
this._elms.labelFar && this._elms.labelFar.forEach((item) => {
item.value = far
})
}
- get unitFuelConsumption() {
- return this.options.unitFuelConsumption
- }
-
- set unitFuelConsumption(v) {
- this.options.unitFuelConsumption = v
- this._elms.unitFuelConsumption && this._elms.unitFuelConsumption.forEach((item) => {
- item.value = v
- })
- }
-
- get fuelShow() {
- return this.options.fuelShow
- }
-
- set fuelShow(v) {
- this.options.fuelShow = v
- let show = v
- if (this.show && (!this.showView || this.showView == 3)) {
- show = v
- }
- else {
- show = false
- }
- if (this.show) {
- if (this.fuelLabel) {
- this.fuelLabel.show = show
- this.label.pixelOffset = this.options.label.pixelOffset + (show ? this.labelFontSize + 20 : 0)
- }
- else {
- this.label.pixelOffset = this.options.label.pixelOffset
- }
- if (this.options.label.position) {
- setTimeout(() => {
- if (this.options.label.position.alt) {
- this.fuelLabel && (this.fuelLabel.position = [this.options.label.position.lng, this.options.label.position.lat, this.options.label.position.alt])
- }
- else {
- this.getClampToHeight({ lng: this.options.label.position.lng, lat: this.options.label.position.lat }).then((height) => {
- this.fuelLabel && (this.fuelLabel.position = [this.options.label.position.lng, this.options.label.position.lat, height])
- })
- }
- }, 0);
- }
- }
- else {
- this.fuelLabel && (this.fuelLabel.show = false)
- this.label.pixelOffset = this.options.label.pixelOffset
- }
- this._elms.fuelShow && this._elms.fuelShow.forEach((item) => {
- item.checked = v
- })
- }
-
// 创建路径
static addLine(that) {
let positions_smooth = that.renewLinePositions(that.options.line.positions)
@@ -1477,7 +1402,6 @@ class TrajectoryMotion extends Base {
}
let pos = that.smooth ? that.positions_smooth : Cesium.Cartesian3.fromDegreesArrayHeights(fromDegreesArrayHeights)
TrajectoryMotion.createLabel(that)
- TrajectoryMotion.createFuelLabel(that)
that.modelMove(pos)
@@ -1487,13 +1411,13 @@ class TrajectoryMotion extends Base {
static async createLabel(that) {
let labelPosition = that.cartesian3Towgs84(that.model.position, that.sdk.viewer)
that.label = new LabelObject(that.sdk, {
- show: that.options.show ? (that.options.label.show ? true : false) : false,
+ show: that.options.show ? (that.options.model.show ? that.options.label.show : false) : false,
position: [labelPosition.lng, labelPosition.lat, labelPosition.alt],
text: that.options.name,
fontSize: that.options.label.fontSize,
fontFamily: that.options.label.fontFamily,
color: that.options.label.color,
- pixelOffset: that.options.label.pixelOffset + (that.options.fuelShow ? that.options.label.fontSize + 20 : 0),
+ pixelOffset: that.options.label.pixelOffset,
backgroundColor: that.options.label.backgroundColor,
lineColor: that.options.label.lineColor,
lineWidth: that.options.label.lineWidth,
@@ -1503,26 +1427,6 @@ class TrajectoryMotion extends Base {
}, that.model)
}
- static async createFuelLabel(that) {
- let labelPosition = that.cartesian3Towgs84(that.model.position, that.sdk.viewer)
- that.fuelLabel = new LabelObject(that.sdk, {
- show: that.options.show ? (that.options.fuelShow ? true : false) : false,
- // show: true,
- position: [labelPosition.lng, labelPosition.lat, labelPosition.alt],
- text: '总油耗:',
- fontSize: that.options.label.fontSize,
- fontFamily: that.options.label.fontFamily,
- color: that.options.label.color,
- pixelOffset: 0,
- backgroundColor: ['#6e6e6e', '#6e6e6e'],
- lineColor: '#00ffff00',
- lineWidth: 0,
- scaleByDistance: that.options.label.scaleByDistance,
- near: that.options.label.near,
- far: that.options.label.far
- }, that.model)
- }
-
// 创建关键点
static async addKeyPoint(that) {
for (let i = 0; i < that.options.line.positions.length; i++) {
@@ -1627,8 +1531,8 @@ class TrajectoryMotion extends Base {
else {
setPosition(startDistance)
setTimeout(() => {
- _this.model.isMove = false
- }, 1000);
+ _this.model && (_this.model.isMove = false)
+ }, 500);
animateUpdate()
@@ -1651,8 +1555,6 @@ class TrajectoryMotion extends Base {
}
async function setPosition(distance) {
- _this.totalFuelConsumption = Number((distance / 100 * _this.unitFuelConsumption).toFixed(2))
- _this.fuelLabel.text = '总油耗:' + _this.totalFuelConsumption + ' L'
_this.model.isMove = true
let sdk2D = get2DView()
let splitSdk = getSdk()
@@ -1864,7 +1766,6 @@ class TrajectoryMotion extends Base {
}
let labelPosition = _this.cartesian3Towgs84(position, _this.sdk.viewer)
_this.label.position = [labelPosition.lng, labelPosition.lat, labelPosition.alt]
- _this.fuelLabel.position = [labelPosition.lng, labelPosition.lat, labelPosition.alt]
lastDistance = distance
// console.log(position)
_this.realTimeRouteArray.push(position)
@@ -2186,7 +2087,7 @@ class TrajectoryMotion extends Base {
rubricElm.style.color = '#ff5733';
rubricElm.style.display = 'none'
- rubricElm.innerHTML = `场景正东方向为轨迹前进正方向
`
+ rubricElm.innerHTML = `场景正北方向为轨迹前进正方向
`
let iconRubric = contentElm.getElementsByClassName('icon-rubric')[0]
iconRubric.addEventListener('mouseenter', (e) => {
rubricElm.style.display = 'block'
@@ -2261,7 +2162,6 @@ class TrajectoryMotion extends Base {
this.sdk.viewer.entities.remove(this.line)
this.sdk.viewer.entities.remove(this.realTimeLine)
this.label && this.label.remove()
- this.fuelLabel && this.fuelLabel.remove()
for (let i = 0; i < this.keyPointShow.length; i++) {
this.sdk.viewer.entities.remove(this.keyPointShow[i])
}
@@ -2269,7 +2169,6 @@ class TrajectoryMotion extends Base {
this.realTimeLine = null
this.model = null
this.label = null
- this.fuelLabel = null
if (this._DialogObject && !this._DialogObject.isDestroy) {
this._DialogObject.close()
this._DialogObject = null
@@ -2323,7 +2222,6 @@ class TrajectoryMotion extends Base {
this.model && (this.model.show = false)
}
this.labelShow = this.originalOptions.label.show
- this.fuelLabelShow = this.originalOptions.fuelShow
this.labelColor = this.originalOptions.label.color
this.labelFontSize = this.originalOptions.label.fontSize
this.labelFontFamily = this.originalOptions.label.fontFamily