diff --git a/ModeratorFrontEnd/AIForOrcas/AIForOrcas.Client.Web/appsettings.Development.json b/ModeratorFrontEnd/AIForOrcas/AIForOrcas.Client.Web/appsettings.Development.json index 09d1fff7..397a6d09 100644 --- a/ModeratorFrontEnd/AIForOrcas/AIForOrcas.Client.Web/appsettings.Development.json +++ b/ModeratorFrontEnd/AIForOrcas/AIForOrcas.Client.Web/appsettings.Development.json @@ -9,7 +9,7 @@ }, "AppSettings": { "APIUrl": "https://apisitename.azurewebsites.net/", - "Locations": [ "Bush Point", "Haro Strait", "Port Townsend" ], + "Locations": [ "Bush Point", "MaST Center", "North San Juan Channel", "Orcasound Lab", "Point Robinson", "Port Townsend", "Sunset Bay" ], "AzureAd": { "Instance": "https://login.microsoftonline.com/", "Domain": "outlookdomain.onmicrosoft.com", diff --git a/ModeratorFrontEnd/AIForOrcas/AIForOrcas.Client.Web/appsettings.json b/ModeratorFrontEnd/AIForOrcas/AIForOrcas.Client.Web/appsettings.json index a287dfd0..ef5d2a8d 100644 --- a/ModeratorFrontEnd/AIForOrcas/AIForOrcas.Client.Web/appsettings.json +++ b/ModeratorFrontEnd/AIForOrcas/AIForOrcas.Client.Web/appsettings.json @@ -23,7 +23,7 @@ "AllowedHosts": "*", "AppSettings": { "APIUrl": "https://apisitename.azurewebsites.net/", - "Locations": [ "Bush Point", "Haro Strait", "Port Townsend" ], + "Locations": [ "Bush Point", "MaST Center", "North San Juan Channel", "Orcasound Lab", "Point Robinson", "Port Townsend", "Sunset Bay" ], "AzureAd": { "Instance": "https://login.microsoftonline.com/", "Domain": "outlookdomain.onmicrosoft.com", diff --git a/ModeratorFrontEnd/AIForOrcas/AIForOrcas.DTO/API/Detections/DetectionQueryParameters.cs b/ModeratorFrontEnd/AIForOrcas/AIForOrcas.DTO/API/Detections/DetectionQueryParameters.cs index 9fb05b36..a6c8e456 100644 --- a/ModeratorFrontEnd/AIForOrcas/AIForOrcas.DTO/API/Detections/DetectionQueryParameters.cs +++ b/ModeratorFrontEnd/AIForOrcas/AIForOrcas.DTO/API/Detections/DetectionQueryParameters.cs @@ -44,7 +44,7 @@ public class DetectionQueryParameters public DateTime? DateTo { get; set; } /// - /// Location of the hydrophone (all, Haro Straight, Port Townsend, etc.). + /// Location of the hydrophone (all, Orcasound Lab, Port Townsend, etc.). /// /// all public string Location { get; set; } = "all"; diff --git a/ModeratorFrontEnd/AIForOrcas/AIForOrcas.DTO/API/Detections/Location.cs b/ModeratorFrontEnd/AIForOrcas/AIForOrcas.DTO/API/Detections/Location.cs index 0a5d4ed8..6dc5c50d 100644 --- a/ModeratorFrontEnd/AIForOrcas/AIForOrcas.DTO/API/Detections/Location.cs +++ b/ModeratorFrontEnd/AIForOrcas/AIForOrcas.DTO/API/Detections/Location.cs @@ -8,7 +8,7 @@ public class Location /// /// Name of the hydrophone location. /// - /// Haro Strait + /// Orcasound Lab public string Name { get; set; } /// diff --git a/ModeratorFrontEnd/OrcaHello/OrcaHello.Web.Api.Tests.Unit/Services/DetectionOrchestrationServiceTests/Default.RetrieveFilteredDetectionsAsync.cs b/ModeratorFrontEnd/OrcaHello/OrcaHello.Web.Api.Tests.Unit/Services/DetectionOrchestrationServiceTests/Default.RetrieveFilteredDetectionsAsync.cs index 2fab980f..d544b1fd 100644 --- a/ModeratorFrontEnd/OrcaHello/OrcaHello.Web.Api.Tests.Unit/Services/DetectionOrchestrationServiceTests/Default.RetrieveFilteredDetectionsAsync.cs +++ b/ModeratorFrontEnd/OrcaHello/OrcaHello.Web.Api.Tests.Unit/Services/DetectionOrchestrationServiceTests/Default.RetrieveFilteredDetectionsAsync.cs @@ -21,7 +21,7 @@ public async Task Default_RetrieveFilteredDetectionsAsync_Expect() Page = 1, PageSize = 10, State = "Positive", - Location = "Haro Straight", + Location = "Orcasound Lab", SortBy = "timestamp", SortOrder = "DESC" }; diff --git a/ModeratorFrontEnd/OrcaHello/OrcaHello.Web.Api.Tests.Unit/Services/MetadataServiceTests/Default.RetrievePaginatedMetadataAsync.cs b/ModeratorFrontEnd/OrcaHello/OrcaHello.Web.Api.Tests.Unit/Services/MetadataServiceTests/Default.RetrievePaginatedMetadataAsync.cs index 52245208..2c1e8441 100644 --- a/ModeratorFrontEnd/OrcaHello/OrcaHello.Web.Api.Tests.Unit/Services/MetadataServiceTests/Default.RetrievePaginatedMetadataAsync.cs +++ b/ModeratorFrontEnd/OrcaHello/OrcaHello.Web.Api.Tests.Unit/Services/MetadataServiceTests/Default.RetrievePaginatedMetadataAsync.cs @@ -23,7 +23,7 @@ public async Task Default_Expect_RetrievePaginatedMetdataAsync() DateTime toDate = DateTime.Now.AddDays(1); var result = await _metadataService. - RetrievePaginatedMetadataAsync("Positive", fromDate, toDate, "timestamp", true, "Haro Straight", 1, 10); + RetrievePaginatedMetadataAsync("Positive", fromDate, toDate, "timestamp", true, "Orcasound Lab", 1, 10); Assert.AreEqual(expectedResult.PaginatedRecords.Count(), result.QueryableRecords.Count()); @@ -54,7 +54,7 @@ public async Task Default_Expect_RetrievePaginatedMetdataAsync_ZeroPageAndPageSi DateTime toDate = DateTime.Now.AddDays(1); var result = await _metadataService. - RetrievePaginatedMetadataAsync("Positive", fromDate, toDate, "timestamp", true, "Haro Straight", -1, -10); + RetrievePaginatedMetadataAsync("Positive", fromDate, toDate, "timestamp", true, "Orcasound Lab", -1, -10); Assert.AreEqual(expectedResult.PaginatedRecords.Count(), result.QueryableRecords.Count()); diff --git a/ModeratorFrontEnd/OrcaHello/OrcaHello.Web.Api/Models/Metadatas/Metadata.cs b/ModeratorFrontEnd/OrcaHello/OrcaHello.Web.Api/Models/Metadatas/Metadata.cs index a734117c..32a17612 100644 --- a/ModeratorFrontEnd/OrcaHello/OrcaHello.Web.Api/Models/Metadatas/Metadata.cs +++ b/ModeratorFrontEnd/OrcaHello/OrcaHello.Web.Api/Models/Metadatas/Metadata.cs @@ -23,7 +23,7 @@ public class Metadata /// /// The name of the hydrophone where the metadata was collected. /// - /// Haro Strait + /// Orcasound Lab [JsonProperty("locationName", NullValueHandling = NullValueHandling.Ignore)] public string LocationName { get; set; } @@ -119,7 +119,7 @@ public class Location /// /// Name of the hydrophone location. /// - /// Haro Strait + /// Orcasound Lab [JsonProperty("name", NullValueHandling = NullValueHandling.Ignore)] public string Name { get; set; } diff --git a/ModeratorFrontEnd/schema/example_v2.json b/ModeratorFrontEnd/schema/example_v2.json index 462111e3..51e8bcd6 100644 --- a/ModeratorFrontEnd/schema/example_v2.json +++ b/ModeratorFrontEnd/schema/example_v2.json @@ -1,14 +1,14 @@ { "id": "000000000-000000000-00000000-00000000000", // Guid "state": "Unreviewed", // State of the review (Unreviewed, Positive, Negative, Unknown) - "locationName": "Haro Strait", // the name of the location (does duplicate name in location below) + "locationName": "Orcasound Lab", // the name of the location (does duplicate name in location below) "audioUri": "https://livemlaudiospecstorage.blob.core.windows.net/audiowavs/rpi_orcasound_lab_2020_09_30_03_51_56_PDT.wav", // string "imageUri": "https://livemlaudiospecstorage.blob.core.windows.net/spectrogramspng/rpi_orcasound_lab_2020_09_30_03_51_56_PDT.png", // string "timestamp": "2020-09-30T10:51:56.057346Z", // ISO format - UTC "whaleFoundConfidence": 88.55000000000001, // double "location": { "id": "rpi_orcasound_lab", - "name": "Haro Strait", + "name": "Orcasound Lab", "longitude": -123.2166658, "latitude": 48.5499978 }, @@ -48,4 +48,4 @@ "_etag": "\"00000000-0000-0000-e1cf-0db2d8c501d9\"", "_attachments": "attachments/", "_ts": 1694120738 - } \ No newline at end of file + }