Merge pull request #28 from KonsumGandalf/sim-27

Display Region Metrics and Years

Author: KonsumGandalf

eslint.base.config.cjs

@@ -94,6 +94,10 @@ module.exports = [
                         {
                             sourceTag: 'domain:streets',
                             onlyDependOnLibsWithTags: ['domain:common', 'domain:incidents', 'domain:rides', 'domain:streets'],
+                        },
+                        {
+                            sourceTag: 'domain:regions',
+                            onlyDependOnLibsWithTags: ['domain:common', 'domain:incidents', 'domain:rides', 'domain:streets', 'domain:regions'],
                         }
                     ],
                 },

libs/common/models/src/lib/enums/public-api.ts

@@ -5,3 +5,4 @@ export * from './sort-order.enum';
 export * from './street-parking.enum';
 export * from './traffic-times.enum';
 export * from './week-days.enum';
+export * from './year.enum';

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

@@ -0,0 +1,11 @@
+export enum EYear {
+	ALL = '2000',
+	Y2018 = '2018',
+	Y2019 = '2019',
+	Y2020 = '2020',
+	Y2021 = '2021',
+	Y2022 = '2022',
+	Y2023 = '2023',
+	Y2024 = '2024',
+	Y2025 = '2025',
+}

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

@@ -1,8 +1,10 @@
 import { ETrafficTimes } from '../enums/traffic-times.enum';
 import { EWeekDays } from '../enums/week-days.enum';
+import { EYear } from '../enums/year.enum';
 
 
 export interface MapFilterOptionsInterface {
 	weekDay?: EWeekDays;
 	trafficTime?: ETrafficTimes;
+	year?: EYear;
 }

libs/common/models/src/lib/interfaces/public-api.ts

@@ -6,4 +6,6 @@ export * from './page.interface';
 export * from './column.interface';
 export * from './request-page.interface';
 export * from './ride.interface';
+export * from './safety-metrics.interface';
+export * from './safety-metrics-street.interface';
 

libs/common/models/src/lib/interfaces/safety-metrics-street.interface.ts

@@ -0,0 +1,5 @@
+import { ISafetyMetrics } from './safety-metrics.interface';
+
+export interface ISafetyMetricsStreet extends ISafetyMetrics {
+	osmId: number;
+}

libs/common/models/src/lib/interfaces/safety-metrics.interface.ts

@@ -0,0 +1,19 @@
+import { ETrafficTimes, EWeekDays, EYear } from '../enums/public-api';
+
+export interface ISafetyMetrics {
+	trafficTime: ETrafficTimes;
+	weekDay: EWeekDays;
+	year: EYear;
+	dangerousColor: string;
+	numberOfRides: number;
+	numberOfIncidents: number;
+	numberOfScaryIncidents: number;
+	dangerousScore: number;
+	numberOfClosePasses: number;
+	numberOfPullInOuts: number;
+	numberOfNearLeftRightHooks: number;
+	numberOfHeadOnApproaches: number;
+	numberOfTailgating: number;
+	numberOfNearDoorings: number;
+	numberOfObstacleDodges: number;
+}

libs/common/state/src/lib/states/map-filter.state.ts

@@ -7,6 +7,7 @@ import { UpdateFilterOptions } from '../actions/map-filter.actions';
 	name: 'map_filter',
 	defaults: {
 		weekDay: undefined,
+		year: undefined,
 		trafficTime: undefined,
 	}
 })

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

@@ -19,15 +19,16 @@
                 "PLACEHOLDER": "Nichts ausgewählt",
                 "COLUMNS": {
                     "ID": "ID",
-                    "OSM_ID": "OSM ID"
+                    "OSM_ID": "OSM ID",
+                    "NAME": "Name"
                 }
             }
         },
         "ENTITY_ATTRIBUTES": {
             "WEEK_DAYS": {
                 "TOOLTIP": {
-                    "WEEK": "Die Tage von Montag bis Freitag",
-                    "WEEKEND": "Die Tage Samstag und Sonntag",
+                    "WEEK": "Montag bis Freitag",
+                    "WEEKEND": "Samstag und Sonntag",
                     "ALL_WEEK": "Alle Tage der Woche"
                 },
                 "LABEL": {
@@ -53,6 +54,12 @@
                     "EVENING_RUSH_HOUR": "Beinhaltet Stunden zwischen 15:30 und 18:59 Uhr",
                     "EVENING_NIGHT_MORNING": "Beinhaltet Stunden zwischen 19:00 und 5:59 Uhr"
                 }
+            },
+            "YEAR": {
+                "LABEL": {
+                    "PLACEHOLDER": "Wählen Sie ein Jahr",
+                    "ALL": "Alle Jahre"
+                }
             }
         }
     },

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

@@ -20,7 +20,8 @@
                 "PLACEHOLDER": "Nothing selected",
                 "COLUMNS": {
                     "ID": "ID",
-                    "OSM_ID": "OSM ID"
+                    "OSM_ID": "OSM ID",
+                    "NAME": "Name"
                 }
             }
         },
@@ -71,8 +72,8 @@
             },
             "WEEK_DAYS": {
                 "TOOLTIP": {
-                    "WEEK": "The days from Monday to Friday",
-                    "WEEKEND": "The days Saturday and Sunday",
+                    "WEEK": "Monday to Friday",
+                    "WEEKEND": "Saturday and Sunday",
                     "ALL_WEEK": "All days of the week"
                 },
                 "LABEL": {
@@ -109,6 +110,12 @@
                     "SEPARATE": "Separate area",
                     "NO": "No Parking"
                 }
+            },
+            "YEAR": {
+                "LABEL": {
+                    "PLACEHOLDER": "Select a year",
+                    "ALL": "All years"
+                }
             }
         }
     },