Skip to content

Commit

Permalink
Rename Haro Strait/Straight to Orcasound Lab (#153)
Browse files Browse the repository at this point in the history
* Rename Haro Strait/Straight to Orcasound Lab

Fixes #145

Signed-off-by: Dave Thaler <dthaler1968@gmail.com>

* Add other missing nodes

Fixes #146

Signed-off-by: Dave Thaler <dthaler1968@gmail.com>

---------

Signed-off-by: Dave Thaler <dthaler1968@gmail.com>
  • Loading branch information
dthaler authored Sep 16, 2024
1 parent 6a39219 commit 7d2ba72
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 12 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public class DetectionQueryParameters
public DateTime? DateTo { get; set; }

/// <summary>
/// Location of the hydrophone (all, Haro Straight, Port Townsend, etc.).
/// Location of the hydrophone (all, Orcasound Lab, Port Townsend, etc.).
/// </summary>
/// <example>all</example>
public string Location { get; set; } = "all";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ public class Location
/// <summary>
/// Name of the hydrophone location.
/// </summary>
/// <example>Haro Strait</example>
/// <example>Orcasound Lab</example>
public string Name { get; set; }

/// <summary>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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());

Expand Down Expand Up @@ -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());

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public class Metadata
/// <summary>
/// The name of the hydrophone where the metadata was collected.
/// </summary>
/// <example>Haro Strait</example>
/// <example>Orcasound Lab</example>
[JsonProperty("locationName", NullValueHandling = NullValueHandling.Ignore)]
public string LocationName { get; set; }

Expand Down Expand Up @@ -119,7 +119,7 @@ public class Location
/// <summary>
/// Name of the hydrophone location.
/// </summary>
/// <example>Haro Strait</example>
/// <example>Orcasound Lab</example>
[JsonProperty("name", NullValueHandling = NullValueHandling.Ignore)]
public string Name { get; set; }

Expand Down
6 changes: 3 additions & 3 deletions ModeratorFrontEnd/schema/example_v2.json
Original file line number Diff line number Diff line change
@@ -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
},
Expand Down Expand Up @@ -48,4 +48,4 @@
"_etag": "\"00000000-0000-0000-e1cf-0db2d8c501d9\"",
"_attachments": "attachments/",
"_ts": 1694120738
}
}

0 comments on commit 7d2ba72

Please sign in to comment.