Skip to content

Commit 42df47f

Browse files
committed
Get rid of 'imagery' selection tab #197
1 parent e8e5034 commit 42df47f

File tree

4 files changed

+4
-49
lines changed

4 files changed

+4
-49
lines changed

src/components/ProcessingPanel.vue

Lines changed: 1 addition & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,7 @@ const { showError, showSuccess } = useNotifier()
3535
const { hasMore, isLoading, searchResults, searchStatus, handleSearchResults } = useSearch()
3636
const { activeTileId, currentBBox, currentBBoxValid, secondActiveTileId, currentMgrsTileId } =
3737
useAreaOfInterest()
38-
const { settings, collections, availableCollections, availableModels, modelIsSingleShot } =
39-
useSettings()
38+
const { settings, availableModels, modelIsSingleShot } = useSettings()
4039
const { isBatchProcessing } = useProcessingMode()
4140
const { placeSearch, isLoadingPlaces, suggestedPlaces, handleLocationSelected } = useGeocoding()
4241
const { processBatch, processSmallArea, isProcessing } = useBatchProcessing()
@@ -265,11 +264,6 @@ watch(sceneSelectionStatus, (newValue) => {
265264
})
266265
watch(map, () => loadAvailableTiles())
267266
268-
const collectionTitle = computed(() => {
269-
const collection = settings.value.collection[0]
270-
return collection ? collections[collection] : null
271-
})
272-
273267
const modelTitle = computed(() => {
274268
const model = settings.value.model
275269
return model ? availableModels.value.find((m) => m.id === model)?.title || null : null
@@ -521,32 +515,6 @@ const getStatus = (condition: any, warn: boolean = false) => {
521515
</v-radio-group>
522516
</v-expansion-panel-text>
523517
</v-expansion-panel>
524-
<!-- Data Collection -->
525-
<v-expansion-panel v-if="currentMgrsTileId && settings.expertMode" value="data">
526-
<v-expansion-panel-title>
527-
<span class="header-text">
528-
<v-badge v-bind="getStatus(collectionTitle)"></v-badge>
529-
Imagery
530-
<v-badge
531-
v-if="collectionTitle"
532-
inline
533-
color="teal"
534-
:content="collectionTitle"
535-
></v-badge>
536-
</span>
537-
</v-expansion-panel-title>
538-
<v-expansion-panel-text>
539-
<v-radio-group v-model="settings.collection" inline hide-details>
540-
<v-radio
541-
v-for="collection in availableCollections"
542-
:key="collection[0]"
543-
:label="collections[collection[0]]"
544-
:value="collection"
545-
color="teal"
546-
/>
547-
</v-radio-group>
548-
</v-expansion-panel-text>
549-
</v-expansion-panel>
550518
<!-- Area of Interest -->
551519
<v-expansion-panel value="aoi">
552520
<v-expansion-panel-title>

src/composables/useSettings.ts

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ export interface Settings {
88
cloudCover: number
99
areaCoverage: number
1010
buffer: number
11-
collection: string[]
1211
model: string
1312
expertMode: boolean
1413
}
@@ -24,14 +23,6 @@ export interface ModelInfo {
2423
default?: boolean
2524
}
2625

27-
const collections: Record<string, string> = {
28-
'sentinel-2-c1-l2a': 'Sentinel-2 Level 2A, Collection 1',
29-
'sentinel-2-l2a': 'Sentinel-2 Level 2A, Legacy',
30-
}
31-
const availableCollections: [keyof typeof collections][] = Object.keys(collections).map((c) => [
32-
c,
33-
]) as [keyof typeof collections][]
34-
3526
const availableModels = shallowRef<ModelInfo[]>([])
3627

3728
// Default settings
@@ -43,7 +34,6 @@ const defaultSettings: Settings = {
4334
cloudCover: 20,
4435
areaCoverage: 60,
4536
buffer: 14,
46-
collection: availableCollections[0],
4737
model: '',
4838
expertMode: false,
4939
}
@@ -129,8 +119,6 @@ const modelIsSingleShot = computed(() => {
129119
export default function useSettings() {
130120
return {
131121
settings,
132-
collections,
133-
availableCollections,
134122
availableModels,
135123
defaultSettings,
136124
defaultModel,

src/functions/search-stac-api.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ export interface SearchSettings {
6868
cloudCover: number
6969
areaCoverage: number
7070
buffer: number
71-
collection?: string[]
7271
autoSceneSelection?: boolean
7372
}
7473

@@ -165,7 +164,7 @@ export default async function searchStacApi(
165164
try {
166165
// Build request body for POST
167166
const requestBody: any = {
168-
collections: params?.collection || ['sentinel-2-c1-l2a'],
167+
collections: ['sentinel-2-c1-l2a'],
169168
limit: 100,
170169
query: {
171170
['eo:cloud_cover']: {

src/views/MapView.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ watch(dontShowAgain, (newValue) => {
3232
<v-card max-width="600" border :prepend-icon="mdiInformation" title="About the Inference App">
3333
<v-card-text>
3434
Welcome to the Fields of the World (FTW) Web App. Use it to run the FTW model on
35-
Sentinel-2 imagery and generate predicted field boundaries for your chosen area of
36-
interest. To get started, either zoom in or click on your area of interest.
35+
Sentinel-2 Level 2A Collection 1 imagery and generate predicted field boundaries for your
36+
chosen area of interest. To get started, either zoom in or click on your area of interest.
3737
</v-card-text>
3838
<v-card-actions>
3939
<v-checkbox-btn v-model="dontShowAgain" label="Don't show again"></v-checkbox-btn>

0 commit comments

Comments
 (0)