From bf8b09a9342f3cc08b7721b9f873c907bc5a9bbe Mon Sep 17 00:00:00 2001 From: aorin Date: Mon, 21 Oct 2024 14:32:14 +0300 Subject: [PATCH 1/7] [bsg] audio viewer default settings are the bird settings --- .../identification-view/identification-view.component.html | 2 +- .../service/kerttu-global-util.service.ts | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/projects/kerttu-global/src/app/+identification/recording-identification/identification-main/identification-view/identification-view.component.html b/projects/kerttu-global/src/app/+identification/recording-identification/identification-main/identification-view/identification-view.component.html index 6d9048d252..bc6d9df774 100644 --- a/projects/kerttu-global/src/app/+identification/recording-identification/identification-main/identification-view/identification-view.component.html +++ b/projects/kerttu-global/src/app/+identification/recording-identification/identification-main/identification-view/identification-view.component.html @@ -21,7 +21,7 @@ Date: Mon, 21 Oct 2024 14:32:52 +0300 Subject: [PATCH 2/7] [bsg] add frog taxon type enum --- projects/kerttu-global/src/app/kerttu-global-shared/models.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/projects/kerttu-global/src/app/kerttu-global-shared/models.ts b/projects/kerttu-global/src/app/kerttu-global-shared/models.ts index 8fe4bd3b0b..ee0d83b8b0 100644 --- a/projects/kerttu-global/src/app/kerttu-global-shared/models.ts +++ b/projects/kerttu-global/src/app/kerttu-global-shared/models.ts @@ -227,7 +227,8 @@ export enum KerttuGlobalErrorEnum { export enum TaxonTypeEnum { bird = 0, bat = 1, - insect = 2 + insect = 2, + frog = 3 } export enum AnnotationStatusEnum { From 86c2d2c4278816c28c6c66fb258778fa81be8853 Mon Sep 17 00:00:00 2001 From: aorin Date: Wed, 20 Nov 2024 12:18:14 +0200 Subject: [PATCH 3/7] fix type errors --- .../species-select/species-list/species-list.component.ts | 2 +- .../species-list/species-table/species-table.component.ts | 2 +- .../app/+validation/species-select/species-select.component.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/kerttu-global/src/app/+validation/species-select/species-list/species-list.component.ts b/projects/kerttu-global/src/app/+validation/species-select/species-list/species-list.component.ts index ee15a270d9..337f978f01 100644 --- a/projects/kerttu-global/src/app/+validation/species-select/species-list/species-list.component.ts +++ b/projects/kerttu-global/src/app/+validation/species-select/species-list/species-list.component.ts @@ -11,7 +11,7 @@ import { IGlobalSpeciesQuery, IGlobalSpeciesFilters, IGlobalSpeciesListResult } export class SpeciesListComponent implements OnChanges { @Input() filters: IGlobalSpeciesFilters = { continent: [], order: [], family: [] }; @Input() query: IGlobalSpeciesQuery = {}; - @Input() speciesList: IGlobalSpeciesListResult = { results: [], currentPage: 0, total: 0, pageSize: 0 }; + @Input() speciesList: IGlobalSpeciesListResult = { results: [], currentPage: 0, total: 0, pageSize: 0, lastPage: 0 }; @Input() loading = false; @Output() speciesSelect = new EventEmitter(); diff --git a/projects/kerttu-global/src/app/+validation/species-select/species-list/species-table/species-table.component.ts b/projects/kerttu-global/src/app/+validation/species-select/species-list/species-table/species-table.component.ts index b9e8b09cb6..82cb4d5530 100644 --- a/projects/kerttu-global/src/app/+validation/species-select/species-list/species-table/species-table.component.ts +++ b/projects/kerttu-global/src/app/+validation/species-select/species-list/species-table/species-table.component.ts @@ -9,7 +9,7 @@ import { IGlobalSpeciesListResult } from '../../../../kerttu-global-shared/model changeDetection: ChangeDetectionStrategy.OnPush }) export class SpeciesTableComponent implements OnInit { - @Input() data: IGlobalSpeciesListResult = { results: [], currentPage: 0, total: 0, pageSize: 0 }; + @Input() data: IGlobalSpeciesListResult = { results: [], currentPage: 0, total: 0, pageSize: 0, lastPage: 0 }; @Input() loading = false; @Input() sorts: DatatableSort[] = []; diff --git a/projects/kerttu-global/src/app/+validation/species-select/species-select.component.ts b/projects/kerttu-global/src/app/+validation/species-select/species-select.component.ts index a13cd342ce..d0dc840b22 100644 --- a/projects/kerttu-global/src/app/+validation/species-select/species-select.component.ts +++ b/projects/kerttu-global/src/app/+validation/species-select/species-select.component.ts @@ -32,7 +32,7 @@ import { TranslateService } from '@ngx-translate/core'; }) export class SpeciesSelectComponent implements OnInit, OnDestroy { speciesFilters$: Observable; - speciesList: IGlobalSpeciesListResult = { results: [], currentPage: 0, total: 0, pageSize: 0 }; + speciesList: IGlobalSpeciesListResult = { results: [], currentPage: 0, total: 0, pageSize: 0, lastPage: 0 }; loading = false; private speciesListSub: Subscription; From d5d9437313f62ba95854035bf159df4e9bef72d1 Mon Sep 17 00:00:00 2001 From: aorin Date: Wed, 20 Nov 2024 12:18:45 +0200 Subject: [PATCH 4/7] [bsg] increase sample rate for bat recordings --- .../kerttu-global/src/app/kerttu-global-shared/variables.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/kerttu-global/src/app/kerttu-global-shared/variables.ts b/projects/kerttu-global/src/app/kerttu-global-shared/variables.ts index 6787a84869..591c62c727 100644 --- a/projects/kerttu-global/src/app/kerttu-global-shared/variables.ts +++ b/projects/kerttu-global/src/app/kerttu-global-shared/variables.ts @@ -1,4 +1,4 @@ export const defaultAudioSampleRate = 33200; export const lowAudioSampleRate = 22050; -export const defaultBatAudioSampleRate = 240000; +export const defaultBatAudioSampleRate = 300000; export const defaultInsectAudioSampleRate = 96000; From 0131532a45ead087de9f407cf9ed09a6a1c41585 Mon Sep 17 00:00:00 2001 From: aorin Date: Tue, 14 Jan 2025 15:14:13 +0200 Subject: [PATCH 5/7] [bsg] add sound type select --- projects/kerttu-global/i18n/en.json | 4 ++++ .../identification-panel.component.html | 12 ++++++++++++ .../identification-panel.component.scss | 5 +++++ .../identification-panel.component.ts | 4 +++- .../identification-table.component.html | 1 + .../identification-table.component.ts | 1 + .../identification-view.component.html | 1 + .../src/app/kerttu-global-shared/models.ts | 6 ++++++ 8 files changed, 33 insertions(+), 1 deletion(-) diff --git a/projects/kerttu-global/i18n/en.json b/projects/kerttu-global/i18n/en.json index 3c0072a0d5..27070fea56 100644 --- a/projects/kerttu-global/i18n/en.json +++ b/projects/kerttu-global/i18n/en.json @@ -75,6 +75,10 @@ "identification.boxes.new": "Draw a new box", "identification.boxes.newRelated": "Draw a related box", "identification.boxes.overlapsWithOthers": "Overlaps with other species", + "identification.boxes.soundType": "Select a sound type", + "identification.boxes.soundType.info": "If possible, define sound type. \"Song/display\" includes songs of songbirds and corresponding territorial/display vocalizations of adult birds, such as drumming of woodpeckers, winnowing of snipes, etc. \"Other\" includes other vocalization types such as flight, warning and contact calls, begging calls of juvenile birds, wing sound, etc. If this categorization is not applicable, sound type does not need to be determined.", + "identification.boxes.soundType.songOrDisplay": "Song/display", + "identification.boxes.soundType.other": "Other", "identification.containsBirdsNotOnList": "Recording contains birds that are not on the list", "identification.containsBirdsNotOnList.info": "Free-text field for species that are not found in the 2019 eBird/Clements taxonomy list. For example Maghreb Owl (Strix [aluco] mauritanica).", "identification.containsHumanSpeech": "Recording contains human speech or other vocalizations", diff --git a/projects/kerttu-global/src/app/+identification/recording-identification/identification-main/identification-view/identification-table/identification-panel/identification-panel.component.html b/projects/kerttu-global/src/app/+identification/recording-identification/identification-main/identification-view/identification-table/identification-panel/identification-panel.component.html index 60737d50d9..f4fa4a33c2 100644 --- a/projects/kerttu-global/src/app/+identification/recording-identification/identification-main/identification-view/identification-table/identification-panel/identification-panel.component.html +++ b/projects/kerttu-global/src/app/+identification/recording-identification/identification-main/identification-view/identification-table/identification-panel/identification-panel.component.html @@ -58,6 +58,18 @@ + + + +