Merge pull request #38 from KonsumGandalf/sim-35

Refactor: Change base path

Author: KonsumGandalf

.dockerignore

@@ -19,6 +19,5 @@ yarn-error.log
 .dockerignore
 docker-compose.yml
 
-# Ignore Json files
-./src/assets/leaflet/region-map.json
-./src/assets/leaflet/street-map.json
+# Ignore Grid Json files
+/src/assets/maplibre

.gitignore

@@ -44,3 +44,6 @@ Thumbs.db
 .nx/workspace-data
 
 .angular
+
+# Ignore Grid Json files
+/src/assets/maplibre

k6s/backend-test.js

@@ -3,17 +3,18 @@ import { sleep, check } from 'k6';
 
 export const options = {
 	vus: 5,
-	duration: '40s',
+	duration: '20s',
 };
 
 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');
+	// 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');
+	const res = http.get('http://konsumpi:8081/api/safety-metrics/streets-grid?weekDay=ALL_WEEK&year=2000&trafficTime=ALL_DAY');
 	// 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,
+		'Status ist 200': (r) => r.status === 200,
 	});
+
 }

k6s/frontend-test.js

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

libs/common/models/src/lib/enums/cycleway-lanes.enum.ts

@@ -1,10 +1,20 @@
 /**
  * Types of cycleway lanes
  * @see https://wiki.openstreetmap.org/wiki/Key:cycleway:lane
+ * @see https://wiki.openstreetmap.org/wiki/Key:cycleway:right
  */
 export enum ECyclewayType {
 	ADVISORY = 'advisory',
 	EXCLUSIVE = 'exclusive',
 	PICTOGRAM = 'pictogram',
-	NO = 'no'
+
+	SHARED_LANE = 'shared_lane',
+	LANE = 'lane',
+	TRACK = 'track',
+	SHARED_BUSWAY = 'shared_busway',
+	SEPARATE = 'separate',
+
+	NO = 'no',
+
+	UNKNOWN = 'unknown'
 }

libs/common/models/src/lib/enums/street-parking.enum.ts

@@ -10,4 +10,5 @@ export enum EParking {
 	SHOULDER = 'shoulder',
 	SEPARATE = 'separate',
 	NO = 'no',
+	YES = 'yes',
 }

libs/common/ui/components/assets/i18n/de.json

@@ -55,7 +55,7 @@
                     "MORNING_RUSH_HOUR": "Beinhaltet Stunden zwischen 7:30 und 9:59 Uhr",
                     "MID_DAY": "Beinhaltet Stunden zwischen 10:00 und 15:29 Uhr",
                     "EVENING_RUSH_HOUR": "Beinhaltet Stunden zwischen 15:30 und 18:59 Uhr",
-                    "EVENING_NIGHT_MORNING": "Beinhaltet Stunden zwischen 19:00 und 5:59 Uhr"
+                    "EVENING_NIGHT_MORNING": "Beinhaltet Stunden zwischen 19:00 und 7:29 Uhr"
                 }
             },
             "YEAR": {
@@ -66,9 +66,7 @@
             }
         }
     },
-    "ATOMS": {
-
-    },
+    "ATOMS": {},
     "MOLECULES": {
         "DANGEROUS_SCORE_BAR": {
             "BAR_LABEL": {

libs/common/ui/components/assets/i18n/en.json

@@ -99,7 +99,7 @@
                     "MORNING_RUSH_HOUR": "Includes hours between 7:30 and 9:59",
                     "MID_DAY": "Includes hours between 10:00 and 15:29",
                     "EVENING_RUSH_HOUR": "Includes hours between 15:30 and 18:59",
-                    "EVENING_NIGHT_MORNING": "Includes hours between 19:00 and 5:59"
+                    "EVENING_NIGHT_MORNING": "Includes hours between 19:00 and 7:29"
                 }
             },
             "STREET_PARKING": {
@@ -125,8 +125,8 @@
     "MOLECULES": {
         "DANGEROUS_SCORE_BAR": {
             "BAR_LABEL": {
-                "LOW_RISK": "High Risk",
-                "HIGH_RISK": "Low Risk"
+                "LOW_RISK": "Low Risk",
+                "HIGH_RISK": "High Risk"
             }
         },
         "SAFETY_METRICS_DIGIT_PANEL": {

libs/common/ui/components/src/lib/atoms/color-block/component/color-block.component.html

@@ -1,2 +1,2 @@
-<div pTooltip="{{'STREETS.EXPLORER.GENERAL.TABLE.HEADER.COLUMNS.SCORE' | translate}}: {{color() | rangePipe}}"></div>
+<div pTooltip="Score: {{color() | rangePipe}}"></div>
 

libs/common/ui/components/src/lib/atoms/color-block/component/color-block.component.ts

@@ -1,6 +1,5 @@
 import { ChangeDetectionStrategy, Component, HostBinding, input, ViewEncapsulation } from '@angular/core';
 import { CommonModule } from '@angular/common';
-import { TranslatePipe } from '@ngx-translate/core';
 import { EDangerousColors } from '@simra/common-models';
 import { Tooltip } from 'primeng/tooltip';
 import { RangePipe } from '../pipes/range.pipe';
@@ -10,7 +9,7 @@ import { RangePipe } from '../pipes/range.pipe';
  */
 @Component({
 	selector: 'a-color-block',
-	imports: [CommonModule, RangePipe, Tooltip, TranslatePipe],
+	imports: [CommonModule, RangePipe, Tooltip],
 	templateUrl: './color-block.component.html',
 	styleUrl: './color-block.component.scss',
 	changeDetection: ChangeDetectionStrategy.OnPush,