Merge pull request #37 from KonsumGandalf/sim-35

Feat: Improve coloring, mobility view and integrate last run for list view

Author: KonsumGandalf

.dockerignore

@@ -18,3 +18,7 @@ yarn-error.log
 # Ignore Docker-specific files
 .dockerignore
 docker-compose.yml
+
+# Ignore Json files
+./src/assets/leaflet/region-map.json
+./src/assets/leaflet/street-map.json

.env.example

@@ -2,3 +2,5 @@ SIMRA_API_URL=localhost:8081/api
 
 MAPILLARY_URL="https://graph.mapillary.com"
 MAPILLARY_ACCESS_TOKEN="YOUR TOKEN"
+
+MAP_TILER_TOKEN="YOUR TOKEN"

.github/workflows/docker.yaml

@@ -35,7 +35,8 @@ jobs:
                   build-args: |
                       MAPILLARY_URL=${{ vars.MAPILLARY_URL }}
                   secrets: |
-                    "simra_api_url=${{ secrets.SIMRA_API_URL }}"
-                    "mapillary_access_token=${{ secrets.MAPILLARY_ACCESS_TOKEN }}"    
-
+                      simra_api_url=${{ secrets.SIMRA_API_URL }}
+                      mapillary_access_token=${{ secrets.MAPILLARY_ACCESS_TOKEN }}
+                      map_tiler_token=${{ secrets.MAP_TILER_TOKEN }}
+                  
 

Dockerfile

@@ -5,10 +5,12 @@ WORKDIR /usr/src/app
 ARG SIMRA_API_URL
 ARG MAPILLARY_URL
 ARG MAPILLARY_ACCESS_TOKEN
+ARG MAP_TILER_TOKEN
 
 ENV SIMRA_API_URL=$SIMRA_API_URL
 ENV MAPILLARY_URL=$MAPILLARY_URL
 ENV MAPILLARY_ACCESS_TOKEN=$MAPILLARY_ACCESS_TOKEN
+ENV MAP_TILER_TOKEN=$MAP_TILER_TOKEN
 ENV NX_DAEMON=false
 
 COPY package*.json ./
@@ -37,8 +39,10 @@ COPY . .
 
 RUN --mount=type=secret,id=simra_api_url \
     --mount=type=secret,id=mapillary_access_token \
+    --mount=type=secret,id=map_tiler_token \
     export SIMRA_API_URL=$(cat /run/secrets/simra_api_url) && \
     export MAPILLARY_ACCESS_TOKEN=$(cat /run/secrets/mapillary_access_token) && \
+    export MAP_TILER_TOKEN=$(cat /run/secrets/map_tiler_token) && \
     nx build --skip-nx-cache
 
 FROM nginx:stable-alpine AS local_production
@@ -54,3 +58,26 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf
 COPY --from=github_builder /usr/src/app/dist/simra/browser /usr/share/nginx/html
 
 EXPOSE 80
+
+FROM node:23-alpine AS local_test
+
+ARG SIMRA_API_URL
+ARG MAPILLARY_URL
+ARG MAPILLARY_ACCESS_TOKEN
+ARG MAP_TILER_TOKEN
+
+ENV SIMRA_API_URL=$SIMRA_API_URL
+ENV MAPILLARY_URL=$MAPILLARY_URL
+ENV MAPILLARY_ACCESS_TOKEN=$MAPILLARY_ACCESS_TOKEN
+ENV MAP_TILER_TOKEN=$MAP_TILER_TOKEN
+ENV NX_DAEMON=false
+
+COPY package*.json ./
+
+RUN npm ci --ignore-scripts
+RUN npm install -g nx
+
+COPY . .
+
+RUN nx serve
+EXPOSE 4200

docker-compose.yaml

@@ -13,7 +13,8 @@ services:
                 SIMRA_API_URL: ${SIMRA_API_URL}
                 MAPILLARY_URL: ${MAPILLARY_URL}
                 MAPILLARY_ACCESS_TOKEN: ${MAPILLARY_ACCESS_TOKEN}
+                MAP_TILER_TOKEN: ${MAP_TILER_TOKEN}
         ports:
-        - "4200:80"
+        - "4200:4200"
         env_file:
             -   .env

k6s/backend-test.js

@@ -0,0 +1,19 @@
+import http from 'k6/http';
+import { sleep, check } from 'k6';
+
+export const options = {
+	vus: 5,
+	duration: '40s',
+};
+
+export default function () {
+	let res = http.get('http://konsumpi:8081/api/streets/grid?lat=52.523232122212534&lng=13.47329869&zoom=9&year=2024');
+	res = http.get('http://konsumpi:8081/api/safety-metrics/simra-regions/Berlin-Potsdam');
+	res = http.get('http://konsumpi:8081/api/safety-metrics/streets?size=20&minNumberOfRides=2&page=0&weekDay=ALL_WEEK&trafficTime=ALL_DAY&year=2000&sort=dangerousScore,DESC');
+	// res = http.get('http://konsumpi:8081/api/safety-metrics/regions?size=20&minNumberOfRides=100&page=0&weekDay=ALL_WEEK&trafficTime=ALL_DAY&year=2000&sort=dangerousScore,DESC');
+
+	check(res, {
+		'Status ist 200': (r) => r.status === 200,
+		'Antwortzeit < 300': (r) => r.timings.duration < 300,
+	});
+}

k6s/frontend-test.js

@@ -0,0 +1,18 @@
+import http from 'k6/http';
+import { sleep, check } from 'k6';
+
+export const options = {
+	vus: 10,
+	duration: '30s',
+};
+
+export default function () {
+	const res = http.get('https://konsumpi:8081/streets/map?lat=52.522&lng=13.413&zoom=14');
+
+	check(res, {
+		'Status ist 200': (r) => r.status === 200,
+		'Antwortzeit < 500ms': (r) => r.timings.duration < 500,
+	});
+
+	sleep(1);
+}

libs/common/models/src/lib/enums/year.enum.ts

@@ -1,6 +1,5 @@
 export enum EYear {
 	ALL = '2000',
-	Y2018 = '2018',
 	Y2019 = '2019',
 	Y2020 = '2020',
 	Y2021 = '2021',

libs/common/models/src/lib/interfaces/app-environment.interface.ts

@@ -6,4 +6,5 @@ export interface AppEnvironmentInterface extends Environment {
 	apiUrl: string;
 	mapillaryUrl: string;
 	mapillaryAccessToken: string;
+	mapTilerToken: string;
 }

libs/common/models/src/lib/interfaces/map-position.interface.ts

@@ -10,4 +10,9 @@ export interface IMapPosition extends CoordinateInterface {
 	 * ID of the street
 	 */
 	osm_id?: number;
+
+	/**
+	 * Indicates if a jump or fly is performed
+	 */
+	isNavigated?: boolean;
 }