From 57a52c394c671fc4fa4258aefbd8b2af02bdd71f Mon Sep 17 00:00:00 2001 From: Walid Aissa Date: Sat, 6 Apr 2024 16:41:37 -0400 Subject: [PATCH] small changes --- angular_ui_app/package-lock.json | 11 +++++++++++ angular_ui_app/package.json | 1 + angular_ui_app/src/app/map/map.component.ts | 8 ++++---- angular_ui_app/src/app/marker.service.ts | 18 ++++++++---------- ...map-areas.geojson => debris-areas.geojson} | 10 +++++----- .../src/assets/map-pins/direction-arrow.png | Bin 0 -> 14736 bytes ...rkers.geojson => obstacle-markers.geojson} | 10 +++++----- 7 files changed, 34 insertions(+), 24 deletions(-) rename angular_ui_app/src/assets/{map-areas.geojson => debris-areas.geojson} (87%) create mode 100644 angular_ui_app/src/assets/map-pins/direction-arrow.png rename angular_ui_app/src/assets/{debris-markers.geojson => obstacle-markers.geojson} (81%) diff --git a/angular_ui_app/package-lock.json b/angular_ui_app/package-lock.json index 98a8ab37..90144edf 100644 --- a/angular_ui_app/package-lock.json +++ b/angular_ui_app/package-lock.json @@ -18,6 +18,7 @@ "@angular/router": "^16.2.0", "bootstrap": "^5.3.1", "leaflet": "^1.9.4", + "leaflet-rotatedmarker": "^0.2.0", "roslib": "^1.4.1", "rxjs": "~7.8.0", "tslib": "^2.3.0", @@ -7761,6 +7762,11 @@ "resolved": "https://registry.npmjs.org/leaflet/-/leaflet-1.9.4.tgz", "integrity": "sha512-nxS1ynzJOmOlHp+iL3FyWqK89GtNL8U8rvlMOsQdTTssxZwCXh8N2NB3GDQOL+YR3XnWyZAxwQixURb+FA74PA==" }, + "node_modules/leaflet-rotatedmarker": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/leaflet-rotatedmarker/-/leaflet-rotatedmarker-0.2.0.tgz", + "integrity": "sha512-yc97gxLXwbZa+Gk9VCcqI0CkvIBC9oNTTjFsHqq4EQvANrvaboib4UdeQLyTnEqDpaXHCqzwwVIDHtvz2mUiDg==" + }, "node_modules/less": { "version": "4.1.3", "resolved": "https://registry.npmjs.org/less/-/less-4.1.3.tgz", @@ -17914,6 +17920,11 @@ "resolved": "https://registry.npmjs.org/leaflet/-/leaflet-1.9.4.tgz", "integrity": "sha512-nxS1ynzJOmOlHp+iL3FyWqK89GtNL8U8rvlMOsQdTTssxZwCXh8N2NB3GDQOL+YR3XnWyZAxwQixURb+FA74PA==" }, + "leaflet-rotatedmarker": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/leaflet-rotatedmarker/-/leaflet-rotatedmarker-0.2.0.tgz", + "integrity": "sha512-yc97gxLXwbZa+Gk9VCcqI0CkvIBC9oNTTjFsHqq4EQvANrvaboib4UdeQLyTnEqDpaXHCqzwwVIDHtvz2mUiDg==" + }, "less": { "version": "4.1.3", "resolved": "https://registry.npmjs.org/less/-/less-4.1.3.tgz", diff --git a/angular_ui_app/package.json b/angular_ui_app/package.json index 2bcb8cd7..f8568db7 100644 --- a/angular_ui_app/package.json +++ b/angular_ui_app/package.json @@ -20,6 +20,7 @@ "@angular/router": "^16.2.0", "bootstrap": "^5.3.1", "leaflet": "^1.9.4", + "leaflet-rotatedmarker": "^0.2.0", "roslib": "^1.4.1", "rxjs": "~7.8.0", "tslib": "^2.3.0", diff --git a/angular_ui_app/src/app/map/map.component.ts b/angular_ui_app/src/app/map/map.component.ts index 9aa9a6a8..03768de1 100644 --- a/angular_ui_app/src/app/map/map.component.ts +++ b/angular_ui_app/src/app/map/map.component.ts @@ -16,16 +16,16 @@ export class MapComponent implements AfterViewInit{ private initMap(): void { this.map = L.map('map', { crs: L.CRS.Simple, - minZoom: 19, - maxZoom: 19 + minZoom: 18, + maxZoom: 18 }); } ngAfterViewInit(): void { this.initMap(); - this.markerService.makeDebrisMarkers(this.map); - this.markerService.makeAreas(this.map); + this.markerService.makeObjectiveMarkers(this.map); + this.markerService.makeDebrisAreas(this.map); this.markerService.makeRoverMarker(this.map); this.markerService.makeControlStationMarker(this.map); } diff --git a/angular_ui_app/src/app/marker.service.ts b/angular_ui_app/src/app/marker.service.ts index 1515b98a..052cee70 100644 --- a/angular_ui_app/src/app/marker.service.ts +++ b/angular_ui_app/src/app/marker.service.ts @@ -1,15 +1,15 @@ import { Injectable } from '@angular/core'; import { HttpClient } from '@angular/common/http'; import * as L from 'leaflet'; -import {MapComponent} from './map/map.component'; - +import 'leaflet-rotatedmarker'; @Injectable({ providedIn: 'root' }) export class MarkerService { - debris: string = '/assets/debris-markers.geojson'; - areas: string = '/assets/map-areas.geojson'; + debris: string = '/assets/obstacle-markers.geojson'; + areas: string = '/assets/debris-areas.geojson'; private gps_data: number[] = [45.506003790, -73.57566751708]; + private prev_gps_data: number[] = [45.506103790, -73.57566751708]; private control_station: number[] = [45.5056037902832, -73.57576751708984]; private blueIcon: L.Icon; private redIcon: L.Icon; @@ -17,12 +17,10 @@ export class MarkerService { constructor(private http: HttpClient) { this.blueIcon = new L.Icon({ - iconUrl: 'assets/map-pins/blue-map-pin.png', + iconUrl: 'assets/map-pins/direction-arrow.png', iconSize: [41, 41], iconAnchor: [12, 41], - popupAnchor: [1, -34], - shadowUrl: 'assets/map-pins/marker-shadow.png', - shadowAnchor: [5, 42] + popupAnchor: [1, -34] }); this.redIcon = new L.Icon({ @@ -44,7 +42,7 @@ export class MarkerService { }); } - makeDebrisMarkers(map: L.Map): void { + makeObjectiveMarkers(map: L.Map): void { this.http.get(this.debris).subscribe((res: any) => { for (const c of res.features) { const lon = c.geometry.coordinates[1]; @@ -55,7 +53,7 @@ export class MarkerService { }); }; - makeAreas(map: L.Map): void { + makeDebrisAreas(map: L.Map): void { this.http.get(this.areas).subscribe((res: any) => { for (const c of res.features) { const lon = c.geometry.coordinates[1]; diff --git a/angular_ui_app/src/assets/map-areas.geojson b/angular_ui_app/src/assets/debris-areas.geojson similarity index 87% rename from angular_ui_app/src/assets/map-areas.geojson rename to angular_ui_app/src/assets/debris-areas.geojson index 723e037a..656848a7 100644 --- a/angular_ui_app/src/assets/map-areas.geojson +++ b/angular_ui_app/src/assets/debris-areas.geojson @@ -9,7 +9,7 @@ "size": 40 }, "properties": { - "name": "obstacle 1" + "name": "debris 1" } }, { @@ -20,7 +20,7 @@ "size": 20 }, "properties": { - "name": "obstacle2" + "name": "debris 2" } }, { @@ -28,10 +28,10 @@ "geometry": { "type": "Circle", "coordinates": [45.50590297241211, -73.57531247558594], - "size": 5 + "size": 10 }, "properties": { - "name": "obstacle3" + "name": "debris 3" } }, { @@ -42,7 +42,7 @@ "size": 30 }, "properties": { - "name": "obstacle4" + "name": "debris 4" } } ] diff --git a/angular_ui_app/src/assets/map-pins/direction-arrow.png b/angular_ui_app/src/assets/map-pins/direction-arrow.png new file mode 100644 index 0000000000000000000000000000000000000000..6920e8c2c983a78e566203299df12ad670becafb GIT binary patch literal 14736 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 F{a+-hjUWI3 literal 0 HcmV?d00001 diff --git a/angular_ui_app/src/assets/debris-markers.geojson b/angular_ui_app/src/assets/obstacle-markers.geojson similarity index 81% rename from angular_ui_app/src/assets/debris-markers.geojson rename to angular_ui_app/src/assets/obstacle-markers.geojson index 38436b42..dc51a773 100644 --- a/angular_ui_app/src/assets/debris-markers.geojson +++ b/angular_ui_app/src/assets/obstacle-markers.geojson @@ -8,17 +8,17 @@ "coordinates": [45.50590297241211, -73.57591247558594] }, "properties": { - "name": "debris1" + "name": "obstacle1" } }, { "type": "Feature", "geometry": { "type": "Point", - "coordinates": [45.50539779663086, -73.5755615234375] + "coordinates": [45.50519779663086, -73.5755615234375] }, "properties": { - "name": "debris2" + "name": "obstacle2" } }, { @@ -28,7 +28,7 @@ "coordinates": [45.50568771362305, -73.5759506225586] }, "properties": { - "name": "debris3" + "name": "obstacle3" } }, { @@ -38,7 +38,7 @@ "coordinates": [45.50548771362305, -73.5756506225586] }, "properties": { - "name": "debris4" + "name": "obstacle4" } } ]