zh/sdk4.0_new
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://xny.yj-3d.com:3000/zh/sdk4.0_new

Browse Source
This commit is contained in:
zh
2025-09-24 17:58:30 +08:00
parent ad305ae16f d20e10644f
commit fafd75f988
10 changed files with 197 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/Global/FlyRoam/index.js
View File

@ -12,8 +12,8 @@ let repeat = 0
let currentRepeat = 0
const open = async (sdk, options = {}, _Dialog = {}) => {
let name = options.name || '飞线漫游'
const open = async (sdk, options = {}, _Dialog = {}, func) => {
let name = options.name || '漫游路径'
options.points || (options.points = [])
if (options.repeat) {
repeat = Number(options.repeat)
@ -74,8 +74,9 @@ const open = async (sdk, options = {}, _Dialog = {}) => {
name = nameElm.value
})
let addListBtn = document.createElement('button');
addListBtn.innerHTML = '保存'
// let addListBtn = document.createElement('button');
let addListBtn = document.getElementsByClassName('saveRoam')[0];
// addListBtn.innerHTML = '保存'
addListBtn.addEventListener('click', () => {
if (!name) {
name = '漫游路径'
@ -85,6 +86,12 @@ const open = async (sdk, options = {}, _Dialog = {}) => {
points.map((item) => {
newPoints.push(item)
})
func({
name: name,
points: newPoints,
repeat: repeat + ''
})
// _Dialog.clickSavePath && _Dialog.clickSavePath(
// {
// name: name,
@ -124,20 +131,20 @@ const open = async (sdk, options = {}, _Dialog = {}) => {
addTrElm(data)
i++
})
let modifyBtn = contentElm.getElementsByClassName('modify-point')[0]
modifyBtn.addEventListener('click', () => {
if (!active) {
return
}
let position = tools.cartesian3Towgs84(viewer.camera.position, viewer)
points[active - 1].position = position
points[active - 1].orientation = {
heading: viewer.camera.heading,
pitch: viewer.camera.pitch,
roll: viewer.camera.roll
}
tools.message({ text: '操作成功' })
})
// let modifyBtn = contentElm.getElementsByClassName('modify-point')[0]
// modifyBtn.addEventListener('click', () => {
// if (!active) {
// return
// }
// let position = tools.cartesian3Towgs84(viewer.camera.position, viewer)
// points[active - 1].position = position
// points[active - 1].orientation = {
// heading: viewer.camera.heading,
// pitch: viewer.camera.pitch,
// roll: viewer.camera.roll
// }
// tools.message({ text: '操作成功' })
// })
let totalTimeElm = contentElm.querySelector("input[name='totalTime']")
let isTotalTimeElm = contentElm.querySelector("input[name='isTotalTime']")
@ -287,11 +294,13 @@ const open = async (sdk, options = {}, _Dialog = {}) => {
// }
})
e_time.addEventListener('input', (v) => {
console.log(isTotalTimeElm, 'isTotalTimeElm')
isTotalTimeElm.checked = false
data.duration = Number(e_time.value)
if (data.duration < 0) {
data.duration = 0
}
console.log(data.duration, 'duration')
})
e_time.addEventListener('blur', () => {
e_time.value = Number(Number(e_time.value).toFixed(2))
@ -325,6 +334,7 @@ const close = () => {
}
const executeFlyTo = (sdk, points = [], index = 0, noStart) => {
console.log(noStart, points, 'noStart')
if (clickHandler) {
clickHandler.destroy()
}

44
src/Global/ScreenShot/index.js
View File

@ -241,11 +241,12 @@ async function ScreenShotHD(sdk, options = {}, cd = () => { }) {
start() {
if (sdk.viewer.scene.imageryLayers._layers.length <= 1) {
this.error = '未加载底图！'
window.ELEMENT && window.ELEMENT.Message({
message: this.error,
type: 'warning',
duration: 1500
});
// window.ELEMENT && window.ELEMENT.Message({
// message: this.error,
// type: 'warning',
// duration: 1500
// });
tools.message({ type: 'warning', text: this.error })
console.warn(this.error)
return
}
@ -258,11 +259,12 @@ async function ScreenShotHD(sdk, options = {}, cd = () => { }) {
}
if (!haveBaseMap) {
this.error = '未加载底图！'
window.ELEMENT && window.ELEMENT.Message({
message: this.error,
type: 'warning',
duration: 1500
});
// window.ELEMENT && window.ELEMENT.Message({
// message: this.error,
// type: 'warning',
// duration: 1500
// });
tools.message({ type: 'warning', text: this.error })
console.warn(this.error)
return
}
@ -327,11 +329,12 @@ async function ScreenShotHD(sdk, options = {}, cd = () => { }) {
if (!layer) {
if (!flag) {
_this.error = '当前范围内未找到底图数据！'
window.ELEMENT && window.ELEMENT.Message({
message: _this.error,
type: 'warning',
duration: 1500
});
// window.ELEMENT && window.ELEMENT.Message({
// message: _this.error,
// type: 'warning',
// duration: 1500
// });
tools.message({ type: 'warning', text: _this.error })
console.warn(_this.error)
}
return
@ -372,11 +375,12 @@ async function ScreenShotHD(sdk, options = {}, cd = () => { }) {
);
if (!MinTile || !MaxTile) {
let error = '超出地球范围！'
window.ELEMENT && window.ELEMENT.Message({
message: error,
type: 'warning',
duration: 1500
});
// window.ELEMENT && window.ELEMENT.Message({
// message: error,
// type: 'warning',
// duration: 1500
// });
tools.message({ type: 'warning', text: error })
console.warn(error)
return
}

12
src/Obj/Analysis/Section/index.js
View File

@ -17,6 +17,7 @@ class Section extends Tools {
this.options.regionsType = this.options.regionsType || false
YJ.Analysis.SectionResults.push(this)
this.Planes = []
this.tools = new Tools();
Section.start(this)
}
@ -34,11 +35,12 @@ class Section extends Tools {
static start(that) {
let positions = that.options.positions || []
if (!that.isConvex(positions)) {
window.ELEMENT && window.ELEMENT.Message({
message: '不支持凹多边形',
type: 'warning',
duration: 1500
});
// window.ELEMENT && window.ELEMENT.Message({
// message: '不支持凹多边形',
// type: 'warning',
// duration: 1500
// });
that.tools.message({ type: 'warning', text: '不支持凹多边形' })
console.log('不支持凹多边形')
return
}

3
src/Obj/Analysis/TerrainExcavation/index.js
View File

@ -158,7 +158,8 @@ class TerrainExcavation extends Tools {
return
}
if (!this.isConvex(positions)) {
this.tools.message({ type: 'warning', text: '至少拥有三个坐标位置！' })
// this.tools.message({ type: 'warning', text: '至少拥有三个坐标位置！' })
this.tools.message({ type: 'warning', text: '不支持凹多边形' })
console.log('不支持凹多边形')
return
}

24
src/Obj/Base/BaseSource/BaseModel/Model/index.js
View File

@ -15,7 +15,6 @@ import { setSplitDirection, syncSplitData, setActiveId, getSdk } from '../../../
import { setActiveViewer, closeRotateAround, closeViewFollow } from '../../../../../Global/global'
class Model extends BaseModel {
#timeoutEventObject = null
/**
* @constructor
* @description 加载模型
@ -88,6 +87,7 @@ class Model extends BaseModel {
console.warn("lat is required!")
return
}
this._timeoutEventObject = null
if (this.options.earth) {
delete this.options.earth
}
@ -266,8 +266,8 @@ class Model extends BaseModel {
}, this.entity)
}
this.entity.isMove = true
clearTimeout(this.#timeoutEventObject)
this.#timeoutEventObject = setTimeout(() => {
clearTimeout(this._timeoutEventObject)
this._timeoutEventObject = setTimeout(() => {
this.entity && (this.entity.isMove = false)
}, 500);
})
@ -304,8 +304,8 @@ class Model extends BaseModel {
}, this.entity)
}
this.entity.isMove = true
clearTimeout(this.#timeoutEventObject)
this.#timeoutEventObject = setTimeout(() => {
clearTimeout(this._timeoutEventObject)
this._timeoutEventObject = setTimeout(() => {
this.entity && (this.entity.isMove = false)
}, 500);
@ -462,6 +462,16 @@ class Model extends BaseModel {
this.options.url = this.options.url || ""
}
get name() {
return this.options.name
}
set name(v) {
console.log(v, 'vvvvvvvvv')
this.options.name = v
this.options.label.text = v
this.label && (this.label.text = v)
}
get color() {
return this.options.color
}
@ -1659,8 +1669,8 @@ class Model extends BaseModel {
this.entity.minimumPixelSize = this.scaleByDistance ? undefined : this.options.minimumPixelSize
this.editObj && this.editObj.update()
this.entity.isMove = true
clearTimeout(this.#timeoutEventObject)
this.#timeoutEventObject = setTimeout(() => {
clearTimeout(this._timeoutEventObject)
this._timeoutEventObject = setTimeout(() => {
this.entity && (this.entity.isMove = false)
}, 500);
}

31
src/Obj/Base/GroundSvg/index.js
View File

@ -60,8 +60,8 @@ class GroundSvg extends Base {
* @param options.customView.relativePosition.lat {number} 纬度
* @param options.customView.relativePosition.alt {number} 高度
* */
#loadEvent = void 0
#loaded = false
// #loadEvent = void 0
// #loaded = false
constructor(sdk, options = {}, _Dialog = {}) {
super(sdk, options);
let jsCode = `
@ -79,6 +79,9 @@ class GroundSvg extends Base {
this.loaded = false;
this.ismove = false;
this._loadEvent = void 0
this._loaded = false
if (this.options.position.lat > 83.5) {
this.options.position.lat = 83.5
}
@ -908,9 +911,9 @@ class GroundSvg extends Base {
}
}
this.loaded = true
this.#loaded = true
if (this.#loadEvent) {
this.#loadEvent()
this._loaded = true
if (this._loadEvent) {
this._loadEvent()
}
this.scale = this.scale
GroundSvg.createText(this)
@ -954,7 +957,7 @@ class GroundSvg extends Base {
* @param {boolean} status=false 状态
*/
async edit(state) {
if (!this.#loaded) {
if (!this._loaded) {
return
}
this.originalOptions = this.deepCopyObj(this.options)
@ -1210,7 +1213,7 @@ class GroundSvg extends Base {
* 重置
*/
reset() {
if (!this.#loaded) {
if (!this._loaded) {
return
}
this.options = this.deepCopyObj(this.originalOptions)
@ -1238,7 +1241,7 @@ class GroundSvg extends Base {
* @param {boolean} status=false 状态
*/
drag(status, cd) {
if (!this.#loaded || !this.sdk || !this.sdk.viewer) {
if (!this._loaded || !this.sdk || !this.sdk.viewer) {
return
}
this.ismove = false
@ -1597,11 +1600,11 @@ class GroundSvg extends Base {
this.ScreenSpaceEventHandler.setInputAction((movement) => {
this.drag(false)
if (!this._DialogObject) {
// if (!this._DialogObject) {
cd && cd(this.options)
syncData(this.sdk, this.options.id)
syncSplitData(this.sdk, this.options.id)
}
// }
}, Cesium.ScreenSpaceEventType.RIGHT_CLICK)
this.pointEntityCollection = new Cesium.EntityCollection()
@ -1706,7 +1709,7 @@ class GroundSvg extends Base {
}
_updateGeojson(data, x, y) {
if (!this.#loaded) {
if (!this._loaded) {
return
}
let width = Math.abs(this.bbox[0] - this.bbox[2])
@ -1727,7 +1730,7 @@ class GroundSvg extends Base {
}
_update() {
if (!this.#loaded) {
if (!this._loaded) {
return
}
let point = turf.point([this.position.lng, this.position.lat]);
@ -2110,11 +2113,11 @@ class GroundSvg extends Base {
}
load(callback) {
if (this.#loaded) {
if (this._loaded) {
callback();
}
else {
this.#loadEvent = callback
this._loadEvent = callback
}
}

6
src/Tools/index.js
View File

@ -970,13 +970,17 @@ class Tools {
return canvas.toDataURL()
}
sampleHeightMostDetailed(positions) {
sampleHeightMostDetailed(positions, sdk) {
let cartesians = []
positions.forEach((item) => {
cartesians.push(new Cesium.Cartographic.fromDegrees(item.lng, item.lat))
})
if (sdk) {
return sdk.viewer.scene.sampleHeightMostDetailed(cartesians)
} else {
return this.sdk.viewer.scene.sampleHeightMostDetailed(cartesians)
}
}
flyHome(duration = 3) {
setActiveViewer(0)

43
src/Tools/projectionConvert.js
View File

@ -93,21 +93,62 @@ const open = async (sdk, closeCallBack) => {
legpObjectLeft.legp_search(tagData, true)
let legpObjectRight = legp(contentElm.getElementsByClassName('right')[0], ".datalist_right")
legpObjectRight.legp_search(tagData, true)
let pickElm = contentElm.getElementsByClassName('pick')[0]
let copyElm = contentElm.getElementsByClassName('copy')[0]
let sourceCopyElm = contentElm.getElementsByClassName('sourceCopy')[0]
let datalistLeftInput = contentElm.getElementsByClassName('datalist_left')[0].getElementsByTagName('input')[0]
datalistLeftInput.value = tagData[0].value
legpObjectLeft.legp_searchActive(tagData[0].value)
let datalistRightInput = contentElm.getElementsByClassName('datalist_right')[0].getElementsByTagName('input')[0]
datalistRightInput.value = tagData[0].value
legpObjectRight.legp_searchActive(tagData[0].value)
let convertElm = contentElm.getElementsByClassName('convert')[0]
let leftXElm = contentElm.getElementsByClassName('left-x')[0]
let leftYElm = contentElm.getElementsByClassName('left-y')[0]
let rightXElm = contentElm.getElementsByClassName('right-x')[0]
let rightYElm = contentElm.getElementsByClassName('right-y')[0]
let beforeleftVal = 'EPSG:4326'
let beforerightVal = 'EPSG:4326'
// 监听输入事件（实时触发）
datalistLeftInput.addEventListener('input', (e) => {
const newValue = e.target.value;
if (leftXElm.value && leftYElm.value) {
let result = proj.convert([{ x: Number(leftXElm.value), y: Number(leftYElm.value) }], beforeleftVal, newValue)
if (result.code === 0) {
leftXElm.value = result.points[0].x
leftYElm.value = result.points[0].y
}
}
beforeleftVal = newValue
// 可以在这里调用legp_searchActive方法
legpObjectLeft.legp_searchActive(newValue);
});
datalistRightInput.addEventListener('input', (e) => {
const newValue = e.target.value;
if (rightXElm.value && rightYElm.value) {
let result = proj.convert([{ x: Number(rightXElm.value), y: Number(rightYElm.value) }], beforerightVal, newValue)
if (result.code === 0) {
rightXElm.value = result.points[0].x
rightYElm.value = result.points[0].y
}
}
beforerightVal = datalistRightInput.value
// 可以在这里调用legp_searchActive方法
legpObjectRight.legp_searchActive(newValue);
});
pickElm.addEventListener('click', () => {
tip && tip.destroy()
event && event.destroy()

8
static/custom/css/index.css
View File

@ -899,14 +899,14 @@
.fly-roam>.content .table .tr .th:first-child,
.fly-roam>.content .table .tr .td:first-child {
flex: 0 0 95px;
width: 95px;
flex: 0 0 70px;
width: 70px;
}
.fly-roam>.content .table .tr .th:nth-child(2),
.fly-roam>.content .table .tr .td:nth-child(2) {
flex: 0 0 240px;
width: 240px;
flex: 0 0 100px;
width: 100px;
}
.fly-roam>.content .table .tr .th:last-child,