vehicle region

mlapaglia · Jun 21, 2021 · 1329339 · 1329339
1 parent 65cd5e0
commit 1329339
Show file tree

Hide file tree

Showing 12 changed files with 379 additions and 14 deletions.
diff --git a/OpenAlprWebhookProcessor/ClientApp/src/app/plates/plates.component.html b/OpenAlprWebhookProcessor/ClientApp/src/app/plates/plates.component.html
@@ -107,6 +107,13 @@
             <mat-option *ngFor="let color of vehicleFilters.vehicleColors" [value]="color">{{color}}</mat-option>
           </mat-select>
         </mat-form-field>
+        <mat-form-field appearance="fill" style="width: 80%;">
+          <mat-label>Vehicle Region</mat-label>
+          <mat-select [disabled]="vehicleFilters.vehicleRegions?.length === 0" [(ngModel)]="filterVehicleRegion">
+            <mat-option [value]=""></mat-option>
+            <mat-option *ngFor="let region of vehicleFilters.vehicleRegions" [value]="region">{{region}}</mat-option>
+          </mat-select>
+        </mat-form-field>
         <mat-error *ngIf="!filterPlateNumberIsValid && regexSearchEnabled">Invalid regex pattern</mat-error>
         <mat-error *ngIf="!filterPlateNumberIsValid && !regexSearchEnabled">Invalid search term</mat-error>
         <div style="padding-top:10px;">

diff --git a/OpenAlprWebhookProcessor/ClientApp/src/app/plates/plates.component.ts b/OpenAlprWebhookProcessor/ClientApp/src/app/plates/plates.component.ts
@@ -72,7 +72,8 @@ export class PlatesComponent implements OnInit, OnDestroy, AfterViewInit {
   public filterVehicleModel: string;
   public filterVehicleType: string;
   public filterVehicleColor: string;
-
+  public filterVehicleRegion: string;
+
   public vehicleFilters: VehicleFilters = {} as VehicleFilters;
 
   public isDeletingPlate: boolean;
@@ -224,6 +225,7 @@ export class PlatesComponent implements OnInit, OnDestroy, AfterViewInit {
     this.filterVehicleModel = '';
     this.filterVehicleType = '';
     this.filterVehicleColor = '';
+    this.filterVehicleRegion = '';
 
     this.searchPlates();
   }

diff --git a/OpenAlprWebhookProcessor/ClientApp/src/app/plates/vehicleFilters.ts b/OpenAlprWebhookProcessor/ClientApp/src/app/plates/vehicleFilters.ts
@@ -8,4 +8,6 @@ export interface VehicleFilters {
     vehicleYears: string[];
 
     vehicleColors: string[];
+
+    vehicleRegions: string[];
 }
diff --git a/OpenAlprWebhookProcessor/Data/Migrations/20210621141700_vehicleregion.Designer.cs b/OpenAlprWebhookProcessor/Data/Migrations/20210621141700_vehicleregion.Designer.cs
diff --git a/OpenAlprWebhookProcessor/Data/Migrations/20210621141700_vehicleregion.cs b/OpenAlprWebhookProcessor/Data/Migrations/20210621141700_vehicleregion.cs
@@ -0,0 +1,23 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace OpenAlprWebhookProcessor.Migrations
+{
+    public partial class vehicleregion : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.RenameColumn(
+                name: "Region",
+                table: "PlateGroups",
+                newName: "VehicleRegion");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.RenameColumn(
+                name: "VehicleRegion",
+                table: "PlateGroups",
+                newName: "Region");
+        }
+    }
+}
diff --git a/OpenAlprWebhookProcessor/Data/Migrations/ProcessorContextModelSnapshot.cs b/OpenAlprWebhookProcessor/Data/Migrations/ProcessorContextModelSnapshot.cs
@@ -231,9 +231,6 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<long>("ReceivedOnEpoch")
                         .HasColumnType("INTEGER");
 
-                    b.Property<string>("Region")
-                        .HasColumnType("TEXT");
-
                     b.Property<string>("VehicleColor")
                         .HasColumnType("TEXT");
 
@@ -243,6 +240,9 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<string>("VehicleMakeModel")
                         .HasColumnType("TEXT");
 
+                    b.Property<string>("VehicleRegion")
+                        .HasColumnType("TEXT");
+
                     b.Property<string>("VehicleType")
                         .HasColumnType("TEXT");
 

diff --git a/OpenAlprWebhookProcessor/Data/Webhook.cs b/OpenAlprWebhookProcessor/Data/Webhook.cs
@@ -20,8 +20,6 @@ public class PlateGroup
 
         public string BestNumber { get; set; }
 
-        public string Region { get; set; }
-
         public string PossibleNumbers { get; set; }
 
         public string Jpeg { get; set; }
@@ -38,6 +36,8 @@ public class PlateGroup
 
         public string VehicleYear { get; set; }
 
+        public string VehicleRegion { get; set; }
+
         public double Direction { get; set; }
 
         public string PlateCoordinates { get; set; }

diff --git a/OpenAlprWebhookProcessor/Hydration/HydrationService.cs b/OpenAlprWebhookProcessor/Hydration/HydrationService.cs
@@ -155,7 +155,7 @@ private static PlateGroup MapResponseToPlate(Response apiResponse)
                         fields.PlateY4,
                     }),
                 ReceivedOnEpoch = DateTimeOffset.Parse(fields.EpochTimeStart).ToUnixTimeMilliseconds(),
-                Region = fields.Region,
+                VehicleRegion = fields.Region,
                 VehicleColor = fields.VehicleColor,
                 VehicleMake = fields.VehicleMake,
                 VehicleMakeModel = fields.VehicleMakeModel,