aboutsummaryrefslogtreecommitdiff
path: root/modern/src/reports
diff options
context:
space:
mode:
authorAnton Tananaev <anton@traccar.org>2022-08-17 07:03:25 -0700
committerAnton Tananaev <anton@traccar.org>2022-08-17 07:03:25 -0700
commit6ec5eaf47904fbec5ac7ecd1939291e3aab60530 (patch)
tree599a59cdcbce26207090662f97ad4e8073a26c09 /modern/src/reports
parent13eaaebb02814e539648c3bc545c3e3d07f204c3 (diff)
downloadtrackermap-web-6ec5eaf47904fbec5ac7ecd1939291e3aab60530.tar.gz
trackermap-web-6ec5eaf47904fbec5ac7ecd1939291e3aab60530.tar.bz2
trackermap-web-6ec5eaf47904fbec5ac7ecd1939291e3aab60530.zip
Geofences on most maps
Diffstat (limited to 'modern/src/reports')
-rw-r--r--modern/src/reports/RouteReportPage.js2
-rw-r--r--modern/src/reports/StopReportPage.js2
-rw-r--r--modern/src/reports/TripReportPage.js2
3 files changed, 6 insertions, 0 deletions
diff --git a/modern/src/reports/RouteReportPage.js b/modern/src/reports/RouteReportPage.js
index bce63e31..a37ad7b1 100644
--- a/modern/src/reports/RouteReportPage.js
+++ b/modern/src/reports/RouteReportPage.js
@@ -20,6 +20,7 @@ import MapPositions from '../map/MapPositions';
import useReportStyles from './common/useReportStyles';
import TableShimmer from '../common/components/TableShimmer';
import MapCamera from '../map/MapCamera';
+import MapGeofence from '../map/MapGeofence';
const RouteReportPage = () => {
const classes = useReportStyles();
@@ -67,6 +68,7 @@ const RouteReportPage = () => {
{selectedItem && (
<div className={classes.containerMap}>
<MapView>
+ <MapGeofence />
{[...new Set(items.map((it) => it.deviceId))].map((deviceId) => (
<MapRoutePath key={deviceId} positions={items.filter((position) => position.deviceId === deviceId)} />
))}
diff --git a/modern/src/reports/StopReportPage.js b/modern/src/reports/StopReportPage.js
index 5d6e837d..36c4d124 100644
--- a/modern/src/reports/StopReportPage.js
+++ b/modern/src/reports/StopReportPage.js
@@ -22,6 +22,7 @@ import MapView from '../map/core/MapView';
import MapCamera from '../map/MapCamera';
import AddressValue from '../common/components/AddressValue';
import TableShimmer from '../common/components/TableShimmer';
+import MapGeofence from '../map/MapGeofence';
const columnsArray = [
['startTime', 'reportStartTime'],
@@ -98,6 +99,7 @@ const StopReportPage = () => {
{selectedItem && (
<div className={classes.containerMap}>
<MapView>
+ <MapGeofence />
<MapPositions positions={[{
deviceId: selectedItem.deviceId,
latitude: selectedItem.latitude,
diff --git a/modern/src/reports/TripReportPage.js b/modern/src/reports/TripReportPage.js
index 7fa98a6c..63988850 100644
--- a/modern/src/reports/TripReportPage.js
+++ b/modern/src/reports/TripReportPage.js
@@ -22,6 +22,7 @@ import AddressValue from '../common/components/AddressValue';
import TableShimmer from '../common/components/TableShimmer';
import MapMarkers from '../map/MapMarkers';
import MapCamera from '../map/MapCamera';
+import MapGeofence from '../map/MapGeofence';
const columnsArray = [
['startTime', 'reportStartTime'],
@@ -145,6 +146,7 @@ const TripReportPage = () => {
{selectedItem && (
<div className={classes.containerMap}>
<MapView>
+ <MapGeofence />
{route && (
<>
<MapRoutePath positions={route} />