Skip to content

H
holo-web
Commit 795327b1 authored by ninglx's avatar ninglx
Browse files
Options

引入pako解压处理数据，部分接口替换固定时间参数

parent bbe19e64
Hide whitespace changes
Inline Side-by-side
Showing with 182 additions and 130 deletions
wj-manage-web/package.json
View file @ 795327b1
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
"highcharts-vue": "^1.4.0", "highcharts-vue": "^1.4.0",
"js-cookie": "^3.0.0", "js-cookie": "^3.0.0",
"js-export-excel": "^1.1.4", "js-export-excel": "^1.1.4",
"pako": "^2.1.0",
"protobufjs": "^7.2.3", "protobufjs": "^7.2.3",
"sortablejs": "^1.13.0", "sortablejs": "^1.13.0",
"vue-clipboard2": "^0.3.1", "vue-clipboard2": "^0.3.1",
......
wj-manage-web/src/components/Standard/map/pathMap.vue
View file @ 795327b1
...@@ -32,16 +32,20 @@ export default { ...@@ -32,16 +32,20 @@ export default {
// 取到数据 fullTrack 开始渲染 // 取到数据 fullTrack 开始渲染
render() { render() {
this.dillPath = JSON.parse(JSON.stringify(this.fullTrack)); this.dillPath = JSON.parse(JSON.stringify(this.fullTrack));
this.playStatus = true; if (this.dillPath[0]?.carInfo?.length) {
console.log("this.dill", this.fullTrack); this.playStatus = true;
map.flyTo({ console.log("this.dill", this.fullTrack);
center: [ map.flyTo({
this.dillPath[0].carInfo[0].longitude, center: [
this.dillPath[0].carInfo[0].latitude, this.dillPath[0].carInfo[0].longitude,
], this.dillPath[0].carInfo[0].latitude,
zoom: 19, ],
}); zoom: 19,
this.renderPath(true); });
this.renderPath(true);
} else {
this.$message("暂无历史轨迹数据");
}
}, },
initMap() { initMap() {
map = new mapboxgl.Map({ map = new mapboxgl.Map({
...@@ -107,7 +111,11 @@ export default { ...@@ -107,7 +111,11 @@ export default {
this.dillPath = []; this.dillPath = [];
}, },
renderPath(begin) { renderPath(begin) {
if (this.dillPath.length && this.playStatus) { if (
this.dillPath.length &&
this.dillPath[0].carInfo?.length &&
this.playStatus
) {
let allData = this.diff(lastFrame.carInfo, this.dillPath[0].carInfo); let allData = this.diff(lastFrame.carInfo, this.dillPath[0].carInfo);
// console.log(this.dillPath[0].frameTime); // console.log(this.dillPath[0].frameTime);
this.$emit( this.$emit(
......
wj-manage-web/src/views/efficiency/crossCompare.vue
View file @ 795327b1
...@@ -102,22 +102,22 @@ export default { ...@@ -102,22 +102,22 @@ export default {
fontSize: getFontSize(12), fontSize: getFontSize(12),
}, },
confine: true, confine: true,
formatter: (params) => { // formatter: (params) => {
// console.log("p", params); // // console.log("p", params);
let str = `${params[0].axisValue}<br/>`; // let str = `${params[0].axisValue}<br/>`;
for (let i = 0; i < params.length; i++) { // for (let i = 0; i < params.length; i++) {
if (i <= 1) { // if (i <= 1) {
str += `${this.nameMap[params[i].seriesName]}(当前值) ${ // str += `${this.nameMap[params[i].seriesName]}(当前值) ${
params[i].value // params[i].value
}%<br/>`; // }%<br/>`;
} else { // } else {
str += `${this.nameMap[params[i].seriesName]}(对比值) ${ // str += `${this.nameMap[params[i].seriesName]}(对比值) ${
params[i].value // params[i].value
}%<br/>`; // }%<br/>`;
} // }
} // }
return str; // return str;
}, // },
}, },
legend: { legend: {
formatter: (item) => { formatter: (item) => {
...@@ -262,13 +262,17 @@ export default { ...@@ -262,13 +262,17 @@ export default {
passingRateOptionData: { passingRateOptionData: {
current: { current: {
xAxis: [], xAxis: [],
onceStopRate: [], // onceStopRate: [],
noStopRate: [], // noStopRate: [],
一次停车通过率: [],
不停车通过率: [],
}, },
compare: { compare: {
xAxis: [], xAxis: [],
onceStopRate: [], // onceStopRate: [],
noStopRate: [], // noStopRate: [],
一次停车通过率: [],
不停车通过率: [],
}, },
}, },
nameMap: { nameMap: {
...@@ -411,10 +415,10 @@ export default { ...@@ -411,10 +415,10 @@ export default {
this.turnMap[indexValue.turnDirNo] this.turnMap[indexValue.turnDirNo]
}` }`
); );
this.passingRateOptionData.current.noStopRate.push( this.passingRateOptionData.current["不停车通过率"].push(
indexValue.noStopRate indexValue.noStopRate
); );
this.passingRateOptionData.current.onceStopRate.push( this.passingRateOptionData.current["一次停车通过率"].push(
indexValue.onceStopRate indexValue.onceStopRate
); );
} }
...@@ -433,10 +437,10 @@ export default { ...@@ -433,10 +437,10 @@ export default {
); );
} }
this.passingRateOptionData.compare.noStopRate.push( this.passingRateOptionData.compare["不停车通过率"].push(
indexValue.noStopRate indexValue.noStopRate
); );
this.passingRateOptionData.compare.onceStopRate.push( this.passingRateOptionData.compare["一次停车通过率"].push(
indexValue.onceStopRate indexValue.onceStopRate
); );
} }
...@@ -447,7 +451,23 @@ export default { ...@@ -447,7 +451,23 @@ export default {
); );
// debugger; // debugger;
// this.passingRateChart.setOption(this.passingRateOption); // this.passingRateChart.setOption(this.passingRateOption);
let chartTitle = { show: false };
if (
!this.passingRateOptionData.current.xAxis.length &&
!this.passingRateOptionData.compare.xAxis.length
) {
chartTitle = {
show: true,
text: "暂无数据",
left: "center",
top: "center",
textStyle: {
color: "#abb9be",
},
};
}
this.passingRateChart.setOption({ this.passingRateChart.setOption({
title: chartTitle,
color: ["#4082f2", "#ffa600", "#d9f4ff"], color: ["#4082f2", "#ffa600", "#d9f4ff"],
tooltip: { tooltip: {
trigger: "axis", trigger: "axis",
...@@ -459,27 +479,27 @@ export default { ...@@ -459,27 +479,27 @@ export default {
fontSize: getFontSize(12), fontSize: getFontSize(12),
}, },
confine: true, confine: true,
formatter: (params) => { // formatter: (params) => {
// console.log("p", params); // // console.log("p", params);
let str = `${params[0].axisValue}<br/>`; // let str = `${params[0].axisValue}<br/>`;
for (let i = 0; i < params.length; i++) { // for (let i = 0; i < params.length; i++) {
if (i <= 1) { // if (i <= 1) {
str += `${this.nameMap[params[i].seriesName]}(当前值) ${ // str += `${this.nameMap[params[i].seriesName]}(当前值) ${
params[i].value // params[i].value
}%<br/>`; // }%<br/>`;
} else { // } else {
str += `${this.nameMap[params[i].seriesName]}(对比值) ${ // str += `${this.nameMap[params[i].seriesName]}(对比值) ${
params[i].value // params[i].value
}%<br/>`; // }%<br/>`;
} // }
} // }
return str; // return str;
}, // },
}, },
legend: { legend: {
formatter: (item) => { // formatter: (item) => {
return this.nameMap[item]; // return this.nameMap[item];
}, // },
right: 0, right: 0,
itemGap: getFontSize(16), itemGap: getFontSize(16),
itemWidth: getFontSize(12), itemWidth: getFontSize(12),
...@@ -568,7 +588,7 @@ export default { ...@@ -568,7 +588,7 @@ export default {
}, },
stack: 1, stack: 1,
label: { label: {
show: key === "onceStopRate", show: key === "一次停车通过率",
position: "bottom", position: "bottom",
formatter: "当前值", formatter: "当前值",
color: "rgba(217, 231, 255, 1)", color: "rgba(217, 231, 255, 1)",
...@@ -590,7 +610,7 @@ export default { ...@@ -590,7 +610,7 @@ export default {
}, },
stack: 2, stack: 2,
label: { label: {
show: key === "onceStopRate", show: key === "一次停车通过率",
position: "bottom", position: "bottom",
formatter: "对比值", formatter: "对比值",
color: "rgba(217, 231, 255, 1)", color: "rgba(217, 231, 255, 1)",
......
wj-manage-web/src/views/efficiency/index.vue
View file @ 795327b1
...@@ -140,14 +140,17 @@ ...@@ -140,14 +140,17 @@
v-model="noVehicleCheckList" v-model="noVehicleCheckList"
> >
<el-checkbox <el-checkbox
style="width: 100%"
label="机动车道" label="机动车道"
v-show="scope.$index === 0" v-show="scope.$index === 0"
></el-checkbox> ></el-checkbox>
<el-checkbox <el-checkbox
style="width: 100%"
label="非机动车道" label="非机动车道"
v-show="scope.$index === 1" v-show="scope.$index === 1"
></el-checkbox> ></el-checkbox>
<el-checkbox <el-checkbox
style="width: 100%"
label="非机动车闯红灯" label="非机动车闯红灯"
v-show="scope.$index === 2" v-show="scope.$index === 2"
></el-checkbox> ></el-checkbox>
...@@ -184,9 +187,9 @@ ...@@ -184,9 +187,9 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
<div class="noDataChart" v-show="!tableData.length"> <!-- <div class="noDataChart" v-show="!tableData.length">
暂无数据 暂无数据
</div> </div> -->
<div class="form_chart"> <div class="form_chart">
<div class="ef_chart" id="chart_no_vehicle"></div> <div class="ef_chart" id="chart_no_vehicle"></div>
</div> </div>
...@@ -662,12 +665,12 @@ export default { ...@@ -662,12 +665,12 @@ export default {
switchTab1() { switchTab1() {
if (this.tableCurrentData) { if (this.tableCurrentData) {
this.pathParam = { this.pathParam = {
// startTime: this.tableCurrentData.windowStartTime, startTime: this.tableCurrentData.windowStartTime,
// endTime: this.tableCurrentData.windowEndTime, endTime: this.tableCurrentData.windowEndTime,
// crossId: this.currentCrossId, crossId: this.currentCrossId,
startTime: "2023-05-21 18:00:25", // startTime: "2023-05-21 18:00:25",
endTime: "2023-05-21 18:00:30", // endTime: "2023-05-21 18:00:30",
crossId: "12F6S08J8T0", // crossId: "12F6S08J8T0",
}; };
this.pathApiName = "passerbyTrack"; this.pathApiName = "passerbyTrack";
this.$nextTick(() => { this.$nextTick(() => {
...@@ -702,12 +705,12 @@ export default { ...@@ -702,12 +705,12 @@ export default {
switchTab2() { switchTab2() {
if (this.tableCurrentData) { if (this.tableCurrentData) {
this.pathParam = { this.pathParam = {
// startTime: this.tableCurrentData.windowStartTime, startTime: this.tableCurrentData.windowStartTime,
// endTime: this.tableCurrentData.windowEndTime, endTime: this.tableCurrentData.windowEndTime,
// crossId: this.currentCrossId, crossId: this.currentCrossId,
startTime: "2023-05-21 18:00:25", // startTime: "2023-05-21 18:00:25",
endTime: "2023-05-21 18:00:30", // endTime: "2023-05-21 18:00:30",
crossId: "12F6S08J8T0", // crossId: "12F6S08J8T0",
}; };
this.pathApiName = "noVehicleTrack"; this.pathApiName = "noVehicleTrack";
this.$nextTick(() => { this.$nextTick(() => {
...@@ -746,12 +749,12 @@ export default { ...@@ -746,12 +749,12 @@ export default {
switchTab3() { switchTab3() {
if (this.tableCurrentData) { if (this.tableCurrentData) {
this.pathParam = { this.pathParam = {
// startTime: this.tableCurrentData.windowStartTime, startTime: this.tableCurrentData.windowStartTime,
// endTime: this.tableCurrentData.windowEndTime, endTime: this.tableCurrentData.windowEndTime,
// crossId: this.currentCrossId, crossId: this.currentCrossId,
startTime: "2023-05-21 18:00:25", // startTime: "2023-05-21 18:00:25",
endTime: "2023-05-21 18:00:30", // endTime: "2023-05-21 18:00:30",
crossId: "12F6S08J8T0", // crossId: "12F6S08J8T0",
}; };
this.pathApiName = "vehicleTrack"; this.pathApiName = "vehicleTrack";
this.$nextTick(() => { this.$nextTick(() => {
...@@ -778,14 +781,14 @@ export default { ...@@ -778,14 +781,14 @@ export default {
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.noDataChart { // .noDataChart {
height: 40%; // height: 40%;
display: flex; // display: flex;
justify-content: center; // justify-content: center;
align-items: center; // align-items: center;
font-size: 16px; // font-size: 16px;
font-weight: 700; // font-weight: 700;
} // }
::v-deep .el-table::before { ::v-deep .el-table::before {
height: 0; height: 0;
...@@ -881,6 +884,9 @@ export default { ...@@ -881,6 +884,9 @@ export default {
font-size: 16px; font-size: 16px;
cursor: pointer; cursor: pointer;
} }
::v-deep .el-checkbox {
width: 100%;
}
} }
/*滚动条样式：谷歌浏览器下*/ /*滚动条样式：谷歌浏览器下*/
......
wj-manage-web/src/views/efficiency/pathMapCtrl.vue
View file @ 795327b1
...@@ -29,8 +29,13 @@ ...@@ -29,8 +29,13 @@
>{{ formatTime(Math.round(currentTime / 1000)) }} / >{{ formatTime(Math.round(currentTime / 1000)) }} /
{{ formatTime(Math.round(duration / 1000)) }}</span {{ formatTime(Math.round(duration / 1000)) }}</span
> >
<el-select class="ctrl-select"> <el-select v-model="speedValue" class="ctrl-select">
<el-option v-for="item of 4" :key="item"></el-option> <el-option
v-for="item of speeds"
:key="item.value"
:label="item.label"
:value="item.value"
></el-option>
</el-select> </el-select>
</div> </div>
</div> </div>
...@@ -39,6 +44,7 @@ ...@@ -39,6 +44,7 @@
<script> <script>
let protobuf = require("protobufjs"); let protobuf = require("protobufjs");
let pako = require("pako");
let FrameList; let FrameList;
protobuf.load("../wj-manage-web/RealtimeCarInfo.proto", (event, root) => { protobuf.load("../wj-manage-web/RealtimeCarInfo.proto", (event, root) => {
FrameList = root.lookupType("com.wanji.holo.proto.FrameList"); FrameList = root.lookupType("com.wanji.holo.proto.FrameList");
...@@ -51,6 +57,12 @@ export default { ...@@ -51,6 +57,12 @@ export default {
components: { pathMap }, components: { pathMap },
data() { data() {
return { return {
speeds: [
{ value: 1, label: "正常速度" },
// {value:'',label:''},
// {value:'',label:''},
],
speedValue: 1,
currentTime: 0, currentTime: 0,
fullTrack: [], fullTrack: [],
playFlag: true, playFlag: true,
...@@ -98,18 +110,27 @@ export default { ...@@ -98,18 +110,27 @@ export default {
// ref调用此方法请求并播放轨迹 // ref调用此方法请求并播放轨迹
getTracksAndPlay() { getTracksAndPlay() {
console.log("this.params", this.params); console.log("this.params", this.params);
let customParam = {
startTime: "2023-05-21 18:00:25",
endTime: "2023-05-21 18:00:30",
crossId: "12F6S08J8T0",
};
this.$refs.pathMap.clearAll(); this.$refs.pathMap.clearAll();
this.playFlag = true; this.playFlag = true;
// 计算轨迹总时长 // 计算轨迹总时长
let diff = let diff =
new Date(this.params.endTime).getTime() - new Date(this.params.endTime).getTime() -
new Date(this.params.startTime).getTime(); new Date(this.params.startTime).getTime();
// let diff =
// new Date(customParam.endTime).getTime() -
// new Date(customParam.startTime).getTime();
this.duration = diff; this.duration = diff;
this.fullTrack = []; this.fullTrack = [];
this.loading = true; this.loading = true;
trackApi[this.apiName](this.params).then((res) => { trackApi[this.apiName](this.params).then((res) => {
let buf = new Uint8Array(res); // trackApi[this.apiName](customParam).then((res) => {
let realData = FrameList.decode(buf); let data = pako.inflate(res); // pako解压为protobuf
let realData = FrameList.decode(data); // protobuf根据定义类型转json
this.fullTrack = realData.frameInfo; this.fullTrack = realData.frameInfo;
this.$nextTick(() => { this.$nextTick(() => {
this.loading = false; this.loading = false;
...@@ -186,6 +207,7 @@ export default { ...@@ -186,6 +207,7 @@ export default {
::v-deep .el-input__inner { ::v-deep .el-input__inner {
height: 24px; height: 24px;
line-height: 24px; line-height: 24px;
padding: 0 8px;
} }
::v-deep .el-input__icon { ::v-deep .el-input__icon {
height: 24px; height: 24px;
......
wj-manage-web/src/views/organization/index.vue
View file @ 795327b1
...@@ -405,7 +405,7 @@ export default { ...@@ -405,7 +405,7 @@ export default {
type: 1, type: 1,
crossId: e.crossId, crossId: e.crossId,
rid: rid.rid, rid: rid.rid,
// ...timeParam, ...timeParam,
}) })
); );
jinchukouList.push(rid.type); jinchukouList.push(rid.type);
...@@ -423,7 +423,7 @@ export default { ...@@ -423,7 +423,7 @@ export default {
crossId: e.crossId, crossId: e.crossId,
type: 1, type: 1,
rid: chukouRid, rid: chukouRid,
// ...timeParam, ...timeParam,
}).then((res) => { }).then((res) => {
console.log("转向流量趋势图", res); console.log("转向流量趋势图", res);
this.loadFlowChart1(res.content); this.loadFlowChart1(res.content);
...@@ -496,7 +496,7 @@ export default { ...@@ -496,7 +496,7 @@ export default {
show: true, show: true,
text: "暂无数据", text: "暂无数据",
left: "center", left: "center",
top: 'center', top: "center",
textStyle: { textStyle: {
color: "#abb9be", color: "#abb9be",
}, },
...@@ -646,7 +646,7 @@ export default { ...@@ -646,7 +646,7 @@ export default {
let timeParam = this.getStartAndEndDate(); let timeParam = this.getStartAndEndDate();
orgPasserby({ orgPasserby({
crossId: this.currentCrossData.id, crossId: this.currentCrossData.id,
// ...timeParam, ...timeParam,
}).then((res) => { }).then((res) => {
console.log("orgpasserby", res); console.log("orgpasserby", res);
this.passerbyFormCheck = res.content.filter((item) => { this.passerbyFormCheck = res.content.filter((item) => {
...@@ -670,7 +670,7 @@ export default { ...@@ -670,7 +670,7 @@ export default {
let timeParam = this.getStartAndEndDate(); let timeParam = this.getStartAndEndDate();
orgNoVehicle({ orgNoVehicle({
crossId: this.currentCrossData.id, crossId: this.currentCrossData.id,
// ...timeParam ...timeParam,
}).then((res) => { }).then((res) => {
console.log("orgnovehicle", res); console.log("orgnovehicle", res);
this.noVehicleFormCheck = res.content.filter((item) => { this.noVehicleFormCheck = res.content.filter((item) => {
......
wj-manage-web/src/views/organization/mapConflict.vue
View file @ 795327b1
...@@ -117,9 +117,9 @@ export default { ...@@ -117,9 +117,9 @@ export default {
let timeParam = this.timeData; let timeParam = this.timeData;
orgConflict({ orgConflict({
crossId: this.rowData.id, crossId: this.rowData.id,
startDate: "", // startDate: "",
endDate: "", // endDate: "",
// ...timeParam, ...timeParam,
}).then((res) => { }).then((res) => {
console.log("conflict...", res); console.log("conflict...", res);
this.allConflicts = res.content; this.allConflicts = res.content;
......
wj-manage-web/src/views/organization/mapFlow.vue
View file @ 795327b1
...@@ -61,9 +61,9 @@ export default { ...@@ -61,9 +61,9 @@ export default {
orgCrossPolygon(params), orgCrossPolygon(params),
orgFlowByLane({ orgFlowByLane({
crossId: this.rowData.id, crossId: this.rowData.id,
startDate: "", // startDate: "",
endDate: "", // endDate: "",
// ...timeParam, ...timeParam,
}), }),
orgLaneLine({ crossId: this.rowData.id }), orgLaneLine({ crossId: this.rowData.id }),
]).then(([res, flow, line]) => { ]).then(([res, flow, line]) => {
......
wj-manage-web/src/views/organization/mapTrack.vue
View file @ 795327b1
...@@ -56,12 +56,16 @@ export default { ...@@ -56,12 +56,16 @@ export default {
// millPoints.push({lng:Math.random()*100,lat:Math.random()*160}) // millPoints.push({lng:Math.random()*100,lat:Math.random()*160})
// } // }
// let param = {startTime:this.timeData.startDate,endTime:this.timeData.endDate, crossId:this.rowData.id}
let param = { let param = {
startTime: "2023-05-21 18:00:25", startTime: this.timeData.startDate,
endTime: "2023-05-21 18:00:30", endTime: this.timeData.endDate,
crossId: "12F6S08J8T0", crossId: this.rowData.id,
}; };
// let param = {
// startTime: "2023-05-21 18:00:25",
// endTime: "2023-05-21 18:00:30",
// crossId: "12F6S08J8T0",
// };
allTrack(param).then((res) => { allTrack(param).then((res) => {
let buf = new Uint8Array(res); let buf = new Uint8Array(res);
let realData = FrameList.decode(buf); let realData = FrameList.decode(buf);
...@@ -74,11 +78,11 @@ export default { ...@@ -74,11 +78,11 @@ export default {
} }
console.log("before render", millPoints); console.log("before render", millPoints);
//--- //---
map.flyTo({ // map.flyTo({
center: [millPoints[0].longitude, millPoints[0].latitude], // center: [millPoints[0].longitude, millPoints[0].latitude],
maxDuration: 1000, // maxDuration: 1000,
zoom: 17.2, // zoom: 17.2,
}); // });
//--- //---
l7Tools.addTrackEasyPoint(scene, millPoints); l7Tools.addTrackEasyPoint(scene, millPoints);
this.loading = false; this.loading = false;
......
wj-manage-web/src/views/safety/analysisTypes.vue
View file @ 795327b1
...@@ -232,6 +232,7 @@ export default { ...@@ -232,6 +232,7 @@ export default {
}, },
series: { series: {
markLine: { markLine: {
silent: true,
data: [ data: [
{ {
symbol: "none", symbol: "none",
......
wj-manage-web/src/views/safety/index.vue
View file @ 795327b1
...@@ -50,14 +50,13 @@ ...@@ -50,14 +50,13 @@
</div> </div>
<el-divider></el-divider> <el-divider></el-divider>
<div class="tabs_bottom"> <div class="tabs_bottom">
<!-- <path-map-ctrl <path-map-ctrl
:params="pathParam" :params="pathParam"
:apiName="pathApiName" :apiName="pathApiName"
ref="pathMap" ref="pathMap"
class="commonPathMap" class="commonPathMap"
style="position: absolute" />
/> --> <!-- <path-map-ctrl ref="pathMap" class="commonPathMap" /> -->
<path-map-ctrl ref="pathMap" class="commonPathMap" />
<el-tabs <el-tabs
:before-leave="beforeLeaveTab" :before-leave="beforeLeaveTab"
v-model="tabsActiveName" v-model="tabsActiveName"
...@@ -173,8 +172,11 @@ export default { ...@@ -173,8 +172,11 @@ export default {
startTime: row.startTime, startTime: row.startTime,
endTime: row.endTime, endTime: row.endTime,
}; };
this.pathParam = {}; this.pathParam = {
this.pathApiName = ""; ...this.cameraTimeBetween,
crossId: row.crossId,
};
this.pathApiName = "allTrack";
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.pathMap.getTracksAndPlay(); this.$refs.pathMap.getTracksAndPlay();
}); });
......
wj-manage-web/src/views/situation/index.vue
View file @ 795327b1
...@@ -977,23 +977,11 @@ export default { ...@@ -977,23 +977,11 @@ export default {
layers.first.license = l7Tools.addLicenseLayer(scene, msg); layers.first.license = l7Tools.addLicenseLayer(scene, msg);
layers.first.licenseBack = l7Tools.addLicenseBackLayer(scene, msg); layers.first.licenseBack = l7Tools.addLicenseBackLayer(scene, msg);
} else { } else {
// for (let i = 0; i < msg.length; i++) {
// for (let old of layers.first.license.encodedData) {
// if (
// msg[i].picLicense === old.shape &&
// turf.distance(
// [msg[i].longitude, msg[i].latitude],
// old.coordinates,
// { units: "kilometers" }
// ) < 0.0005
// ) {
// msg[i].longitude = old.coordinates[0];
// msg[i].latitude = old.coordinates[1];
// }
// }
// }
layers.first.license.setData(msg); layers.first.license.setData(msg);
layers.first.licenseBack.setData(msg); let backData = msg.filter((item) => {
return item.picLicense !== "";
});
layers.first.licenseBack.setData(backData);
show(layers.first.license); show(layers.first.license);
show(layers.first.licenseBack); show(layers.first.licenseBack);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment