From b0741fc0fe3f56331ffce3dbd75221036ae68136 Mon Sep 17 00:00:00 2001 From: Marcel Schwarz Date: Fri, 15 Jan 2021 12:24:15 +0100 Subject: [PATCH] Change color and performance in table --- .../frontend/src/app/dashboard/table/table.component.ts | 4 ++-- projects/project-3/frontend/src/app/service/map.service.ts | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/projects/project-3/frontend/src/app/dashboard/table/table.component.ts b/projects/project-3/frontend/src/app/dashboard/table/table.component.ts index 03c5ab6..268b446 100644 --- a/projects/project-3/frontend/src/app/dashboard/table/table.component.ts +++ b/projects/project-3/frontend/src/app/dashboard/table/table.component.ts @@ -86,11 +86,11 @@ export class TableComponent implements OnInit { this.colors = ['black', 'gray', 'green', 'orange', 'purple', 'red']; this.stationToSource = this.setBikePointColorToSource(stationTo); this.iterableToSource = stationTo; - this.iterableToSource.forEach(bikePoint => bikePoint.polyLineColor = 'green'); + this.iterableToSource.forEach(bikePoint => bikePoint.polyLineColor = 'red'); this.stationFromSource = this.setBikePointColorFromSource(stationFrom); this.iterableFromSource = stationFrom; - this.iterableFromSource.forEach(bikePoint => bikePoint.polyLineColor = 'red'); + this.iterableFromSource.forEach(bikePoint => bikePoint.polyLineColor = 'green'); this.selectionModel.select(...this.iterableFromSource.filter(bikePoint => bikePoint.stationId === this.bikePoint.id)); this.selectionModel.select(...this.iterableToSource.filter(bikePoint => bikePoint.stationId === this.bikePoint.id)); diff --git a/projects/project-3/frontend/src/app/service/map.service.ts b/projects/project-3/frontend/src/app/service/map.service.ts index 297f9fd..d91ac47 100644 --- a/projects/project-3/frontend/src/app/service/map.service.ts +++ b/projects/project-3/frontend/src/app/service/map.service.ts @@ -159,7 +159,8 @@ export class MapService { color: severityColor, fillColor: severityColor, fillOpacity: 0.5, - radius: 30 + radius: 30, + interactive: false }); accidents.push(accidentMarker); } @@ -198,8 +199,8 @@ export class MapService { marker.on('mouseout', e => e.target.closePopup()); this.drawLineOnMiniMap(marker, point); this.markerLayer.push(marker); - this.miniMap.fitBounds(L.featureGroup([this.dashBoardMarker, ...this.markerLayer]).getBounds()); } + this.miniMap.fitBounds(L.featureGroup([this.dashBoardMarker, ...this.markerLayer]).getBounds()); if (this.polylineLayer.length === 0) { this.legend.remove(); } else {