diff --git a/src/components/Map.jsx b/src/components/Map.jsx index 292ac58..4857f4c 100644 --- a/src/components/Map.jsx +++ b/src/components/Map.jsx @@ -1,4 +1,4 @@ -import React, { useEffect, useRef, useState, useMemo, useImperativeHandle, forwardRef, useCallback } from 'react'; +import React, { useEffect, useRef, useState, useMemo, useImperativeHandle, forwardRef, useCallback } from 'react'; import carImg from '../assets/images/carplane.png'; import planeImg from '../assets/images/planeicon.png'; import cameraImg from '../assets/images/camera.png'; @@ -214,14 +214,13 @@ const CesiumMap = React.forwardRef(({ ifClear, ifClearPlanLine, ifClearNavLine, baseLayerPicker: true, geocoder: false, homeButton: false, - sceneModePicker: true, + sceneModePicker: false, navigationHelpButton: false, fullscreenButton: false, infoBox: false, - terrain: Cesium.Terrain.fromWorldTerrain(), imageryProvider: new Cesium.UrlTemplateImageryProvider({ - url: "https://mt1.google.com/vt/lyrs=y&x={x}&y={y}&z={z}", - credit: "Google Maps" + url: "https://services.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}", + fileExtension: "jpg" }) }); viewer.resolutionScale = 2.0; @@ -3597,32 +3596,6 @@ const CesiumMap = React.forwardRef(({ ifClear, ifClearPlanLine, ifClearNavLine, duration, }); }, - setMapType: (type) => { - const viewer = viewerRef.current; - if (!viewer) return; - viewer.imageryLayers.removeAll(); - let url = ""; - if (type === 'google-satellite') { - url = "https://mt1.google.com/vt/lyrs=y&x={x}&y={y}&z={z}"; - } else if (type === 'google-streets') { - url = "https://mt1.google.com/vt/lyrs=m&x={x}&y={y}&z={z}"; - } else { - url = "https://services.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}"; - } - viewer.imageryLayers.addImageryProvider(new Cesium.UrlTemplateImageryProvider({ - url: url, - credit: "Map Data" - })); - }, - toggle3D: (is3D) => { - const viewer = viewerRef.current; - if (!viewer) return; - if (is3D) { - viewer.scene.mode = Cesium.SceneMode.SCENE3D; - } else { - viewer.scene.mode = Cesium.SceneMode.SCENE2D; - } - } })); return ( diff --git a/src/components/devices/DeviceStatusPage.tsx b/src/components/devices/DeviceStatusPage.tsx index 0c9c9b6..7f24547 100644 --- a/src/components/devices/DeviceStatusPage.tsx +++ b/src/components/devices/DeviceStatusPage.tsx @@ -2627,9 +2627,9 @@ export default function DeviceStatusPage() { - } label={t('devices.rtLeftMeasureRpm')} value={(runningStatus?.left_measured_rpm ?? runningStatus?.leftMeasureSpeed) !== undefined ? Number(runningStatus?.left_measured_rpm ?? runningStatus?.leftMeasureSpeed).toFixed(1) + 'rpm' : '-'} /> + {/*} label={t('devices.rtLeftMeasureRpm')} value={(runningStatus?.left_measured_rpm ?? runningStatus?.leftMeasureSpeed) !== undefined ? Number(runningStatus?.left_measured_rpm ?? runningStatus?.leftMeasureSpeed).toFixed(1) + 'rpm' : '-'} />*/} - } label={t('devices.rtRightMeasureRpm')} value={(runningStatus?.right_measured_rpm ?? runningStatus?.rightMeasureSpeed) !== undefined ? Number(runningStatus?.right_measured_rpm ?? runningStatus?.rightMeasureSpeed).toFixed(1) + 'rpm' : '-'} /> + {/*} label={t('devices.rtRightMeasureRpm')} value={(runningStatus?.right_measured_rpm ?? runningStatus?.rightMeasureSpeed) !== undefined ? Number(runningStatus?.right_measured_rpm ?? runningStatus?.rightMeasureSpeed).toFixed(1) + 'rpm' : '-'} />*/} } label={t('devices.rtLeftMotorRpm')} value={runningStatus?.left_motor_rpm !== undefined ? Number(runningStatus?.left_motor_rpm).toFixed(1) + 'rpm' : '-'} /> @@ -2861,9 +2861,9 @@ export default function DeviceStatusPage() {
-
{t('devices.rtPositioning')}:{runningStatus?.qual == 0 ? t('constants.locationInvalid') : runningStatus?.qual == 1 ? t('devices.gpsSingle') : runningStatus?.qual == 2 ? t('devices.dgpsDiff') : runningStatus?.qual == 4 ? t('devices.rtkFixed2') : runningStatus?.qual == 5 ? t('devices.rtkFloat') : t('constants.locationUnknown')}
+ {/*
{t('devices.rtPositioning')}:{runningStatus?.qual == 0 ? t('constants.locationInvalid') : runningStatus?.qual == 1 ? t('devices.gpsSingle') : runningStatus?.qual == 2 ? t('devices.dgpsDiff') : runningStatus?.qual == 4 ? t('devices.rtkFixed2') : runningStatus?.qual == 5 ? t('devices.rtkFloat') : t('constants.locationUnknown')}
*/} -
{t('devices.rtSatellites')}:{t('devices.satelliteCount', { count: runningStatus?.satelliteCnt || 0 })}
+ {/*
{t('devices.rtSatellites')}:{t('devices.satelliteCount', { count: runningStatus?.satelliteCnt || 0 })}
*/}
{t('devices.rtHeadingAngle')}:{runningStatus?.yaw !== undefined ? Number(runningStatus?.yaw).toFixed(1) + '°' : '-'}
diff --git a/src/pages/TaskMonitorPage.tsx b/src/pages/TaskMonitorPage.tsx index ef60ddd..f152dbe 100644 --- a/src/pages/TaskMonitorPage.tsx +++ b/src/pages/TaskMonitorPage.tsx @@ -453,16 +453,7 @@ const TaskMonitorPage: React.FC = () => { ))}
-
- - -
+