From 3b0889862c095b742e6ac5321a3fb826240433e2 Mon Sep 17 00:00:00 2001 From: Tim Herbst Date: Sun, 27 Dec 2020 20:19:46 +0100 Subject: [PATCH] adjust drawAccidents to display accidents without clustering --- .../frontend/src/app/service/map.service.ts | 12 ++++-------- projects/project-3/frontend/src/styles.css | 11 ----------- projects/project-3/frontend/src/styles.css.map | 1 - projects/project-3/frontend/src/styles.scss | 1 - 4 files changed, 4 insertions(+), 21 deletions(-) delete mode 100644 projects/project-3/frontend/src/styles.css delete mode 100644 projects/project-3/frontend/src/styles.css.map 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 c8a85fb..9422ba6 100644 --- a/projects/project-3/frontend/src/app/service/map.service.ts +++ b/projects/project-3/frontend/src/app/service/map.service.ts @@ -91,11 +91,7 @@ export class MapService { public drawAccidents(): void { this.fetchAccidentGeoData().then(data => { const myRenderer = L.canvas({padding: 0.5}); - const accidentCluster = L.markerClusterGroup({ - spiderflyOnMaxZoom: true, - showCoverageOnHover: true, - zoomToBoundsOnClick: true - }); + const accidents = []; for (const accident of data) { const severityColor = this.getAccidentColor(accident.severity); const accidentMarker = L.circle([accident.lat, accident.lon], { @@ -103,11 +99,11 @@ export class MapService { color: severityColor, fillColor: severityColor, fillOpacity: 0.5, - radis: 25 + radius: 30 }); - accidentCluster.addLayer(accidentMarker); + accidents.push(accidentMarker); } - this.mapOverlays.Accidents = accidentCluster; + this.mapOverlays.Accidents = L.layerGroup(accidents); this.drawMapControl(); }); } diff --git a/projects/project-3/frontend/src/styles.css b/projects/project-3/frontend/src/styles.css deleted file mode 100644 index a2ae038..0000000 --- a/projects/project-3/frontend/src/styles.css +++ /dev/null @@ -1,11 +0,0 @@ -@import "~leaflet/dist/leaflet.css"; -html, body { - height: 100%; -} - -body { - margin: 0; - font-family: Roboto, "Helvetica Neue", sans-serif; -} - -/*# sourceMappingURL=styles.css.map */ diff --git a/projects/project-3/frontend/src/styles.css.map b/projects/project-3/frontend/src/styles.css.map deleted file mode 100644 index 4cd67a6..0000000 --- a/projects/project-3/frontend/src/styles.css.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"sourceRoot":"","sources":["styles.scss"],"names":[],"mappings":"AASQ;AATR;EACE;;;AAGF;EACE;EACA","file":"styles.css"} \ No newline at end of file diff --git a/projects/project-3/frontend/src/styles.scss b/projects/project-3/frontend/src/styles.scss index de7754d..d528429 100644 --- a/projects/project-3/frontend/src/styles.scss +++ b/projects/project-3/frontend/src/styles.scss @@ -7,7 +7,6 @@ body { font-family: Roboto, "Helvetica Neue", sans-serif; } -@import '@angular/material/prebuilt-themes/deeppurple-amber.css'; @import "~leaflet/dist/leaflet.css"; @import "~leaflet.markercluster/dist/MarkerCluster.css"; @import "~leaflet.markercluster/dist/MarkerCluster.Default.css";