Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add cloud data #61

Merged
merged 6 commits into from
Sep 13, 2024
Merged

Add cloud data #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
096439b
add and display cloud data
johnarban Aug 14, 2024
ae20915
add interface
johnarban Aug 14, 2024
10f746c
fix show cloud checkbox
johnarban Aug 14, 2024
b9812d9
relabel
johnarban Aug 14, 2024
2530a0f
add help text and fix some css
johnarban Aug 14, 2024
5973dea
add cloud data to preload
johnarban Aug 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
120 changes: 100 additions & 20 deletions src/TempoLite.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,20 @@
<div id="map-contents" style="width:100%; height: 100%;">
<div id="map"></div>
<div v-if="showFieldOfRegard" id="map-legend"><hr class="line-legend">TEMPO Field of Regard</div>
<!-- show hide cloud data, disable if none is available -->
<div id="map-show-hide-clouds">
<v-btn
class="ma-2"
v-if="cloudTimestamps.length > 0"
@click="showClouds = !showClouds"
@keyup.enter="showClouds = !showClouds"
elevation="5"
:color="cloudDataAvailable ? showClouds ? accentColor : buttonColor : 'grey'"
:disabled="!cloudDataAvailable"
:icon="`${(!showClouds || !cloudDataAvailable) ? 'mdi-cloud-off-outline' : 'mdi-cloud-outline'}`"
>
</v-btn>
</div>
<location-search
v-model="searchOpen"
small
Expand Down Expand Up @@ -394,7 +408,7 @@
item-value="tz"
></v-select>
<div id="control-checkboxes">
<div class="d-flex flex-row align-center space-between">
<div class="d-flex flex-row align-center justify-space-between">
<v-checkbox
v-model="showFieldOfRegard"
@keyup.enter="showFieldOfRegard = !showFieldOfRegard"
Expand All @@ -412,6 +426,21 @@
</p>
</info-button>
</div>
<div class="d-flex flex-row align-center justify-space-between">
<v-checkbox
v-model="showClouds"
@keyup.enter="showClouds = !showClouds"
:disabled="!cloudDataAvailable"
:label="cloudDataAvailable ? 'Show Cloud Mask' : 'No Cloud Data Available'"
color="#c10124"
hide-details
/>
<info-button>
<p>
The cloud mask shows where the satellite could not measure NO<sub>2</sub> because of cloud cover.
</p>
</info-button>
</div>
<v-checkbox
v-if="false"
:disabled="!highresAvailable"
Expand All @@ -433,7 +462,7 @@
hide-details
>
</v-slider>
<div id="opacity-slider-label">TEMPO opacity</div>
<div id="opacity-slider-label">Overlay opacity</div>
</div>
</div>
<!-- add text box that allows manually setting the custom image url -->
Expand Down Expand Up @@ -514,12 +543,13 @@

</article>
</div>
<div id="body-logos">
<a href="https://www.si.edu/" target="_blank" rel="noopener noreferrer" class="mr-1"
><img alt="Smithsonian Logo" src="./assets/smithsonian.png"
/></a>
<credit-logos/>
</div>

</div>
<div id="body-logos">
<a href="https://www.si.edu/" target="_blank" rel="noopener noreferrer" class="mr-1"
><img alt="Smithsonian Logo" src="./assets/smithsonian.png"
/></a>
<credit-logos/>
</div>
</div>
</v-app>
Expand Down Expand Up @@ -555,7 +585,7 @@ import { getTimestamps } from "./timestamps";
const erdTimestamps: number[] = [];
const newTimestamps: number[] = [];


const cloudTimestamps: number[] = [];

const fosterTimestamps = [
1698838920000,
Expand Down Expand Up @@ -761,6 +791,13 @@ export default defineComponent({

loadedImagesProgress: 0,
useHighRes: false,

cloudOverlay: new L.ImageOverlay("", novDecBounds, {
opacity,
interactive: false,
}),
cloudTimestamps,
showClouds: true,
};
},

Expand Down Expand Up @@ -804,6 +841,7 @@ export default defineComponent({

this.singleDateSelected = this.uniqueDays[this.uniqueDays.length-1].value;
this.imageOverlay.setUrl(this.imageUrl).addTo(this.map as Map);
this.cloudOverlay.setUrl(this.cloudUrl).addTo(this.map as Map);

this.updateFieldOfRegard();
if (this.showFieldOfRegard) {
Expand Down Expand Up @@ -917,6 +955,21 @@ export default defineComponent({
return url + this.imageName;
},

cloudUrl(): string {
if (!this.showClouds) {
return '';
}

if (this.cloudTimestamps.includes(this.timestamp)) {
return this.getCloudFilename(this.date);
}
return '';
},

cloudDataAvailable(): boolean {
return this.cloudTimestamps.includes(this.timestamp);
},

whichDataSet(): string {
if (this.fosterTimestamps.includes(this.timestamp)) {
return 'TEMPO-lite';
Expand Down Expand Up @@ -1046,6 +1099,7 @@ export default defineComponent({
},
updateBounds() {
this.imageOverlay.setBounds(this.imageBounds);
this.cloudOverlay.setBounds(this.imageBounds);
},

// preloadImages(images: string[]) {
Expand All @@ -1058,9 +1112,19 @@ export default defineComponent({
this.erdTimestamps = ts.early_release;
this.newTimestamps = ts.released;
this.timestamps = this.timestamps.concat(this.erdTimestamps, this.newTimestamps).sort();
this.cloudTimestamps = ts.clouds;
});
},

getCloudFilename(date: Date): string {
const filename = this.getTempoFilename(date);
if (this.useHighRes) {
return 'https://raw.githubusercontent.com/johnarban/tempo-data-holdings/main/clouds/images/' + filename;
} else {
return 'https://raw.githubusercontent.com/johnarban/tempo-data-holdings/main/clouds/images/resized_images/' + filename;
}
},

getTempoFilename(date: Date): string {
return `tempo_${date.getUTCFullYear()}-${zpad(date.getUTCMonth()+1)}-${zpad(date.getUTCDate())}T${zpad(date.getUTCHours())}h${zpad(date.getUTCMinutes())}m.png`;
},
Expand Down Expand Up @@ -1114,6 +1178,8 @@ export default defineComponent({
console.log('preloading images for ', this.thumbLabel);
const times = this.timestamps.slice(this.minIndex, this.maxIndex + 1);
const images = times.map(ts => this.getTempoDataUrl(ts) + this.getTempoFilename(new Date(ts)));
const cloudImages = times.filter(ts => this.cloudTimestamps.includes(ts)).map(ts => this.getCloudFilename(new Date(ts)));
images.push(...cloudImages);
const promises = _preloadImages(images);
let loaded = 0;
this.loadedImagesProgress = 0;
Expand Down Expand Up @@ -1170,6 +1236,10 @@ export default defineComponent({
this.updateFieldOfRegard();
},

cloudUrl(url: string) {
this.cloudOverlay.setUrl(url);
},

useHighRes() {
this.imagePreload();
},
Expand Down Expand Up @@ -1221,6 +1291,7 @@ export default defineComponent({

opacity(value: number) {
this.imageOverlay.setOpacity(value);
this.cloudOverlay.setOpacity(value);
}
}
});
Expand Down Expand Up @@ -1461,12 +1532,12 @@ ul {
grid-row: 4 / 6;
}

#body-logos {
grid-column: 3 / 4;
grid-row: 5 / 6;
align-self: end;
justify-self: end;
}
// #body-logos {
// grid-column: 3 / 4;
// grid-row: 5 / 6;
// align-self: end;
// justify-self: end;
// }
}

// style the content
Expand Down Expand Up @@ -1599,6 +1670,13 @@ a {
width: 250px;
border: 2px solid black;
}

#map-show-hide-clouds {
z-index: 1000;
position: absolute;
top: 1rem;
right: 80px;
}

#map-legend {
position: absolute;
Expand Down Expand Up @@ -1718,7 +1796,7 @@ a {
width: 100%;
display: flex;
flex-direction: column;
gap: 10px;
gap: 5px;
}

#opacity-slider-container {
Expand All @@ -1742,8 +1820,10 @@ a {
}

#body-logos {
margin-bottom: -1rem;
display: flex;
flex-direction: row;
justify-content: flex-end;
img {
height: 35px !important;
vertical-align: middle;
Expand Down Expand Up @@ -1914,10 +1994,10 @@ i.mdi-menu-down {
grid-row: 6 / 7;
}

#body-logos {
grid-column: 1 / 2;
grid-row: 7 / 8;
}
// #body-logos {
// grid-column: 1 / 2;
// grid-row: 7 / 8;
// }
}

.content-with-sidebars {
Expand Down
9 changes: 8 additions & 1 deletion src/timestamps.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,11 @@ export interface Manifest {
resized_image_directory: string;
timestamps: number[];
};
clouds: {
image_directory: string;
resized_image_directory: string;
timestamps: number[];
};
}

export async function fetchManifest(): Promise<Manifest> {
Expand All @@ -20,11 +25,13 @@ export async function fetchManifest(): Promise<Manifest> {
interface Timestamps {
early_release: number[];
released: number[];
clouds: number[];
}

export async function getTimestamps(): Promise<Timestamps> {
const manifest = await fetchManifest();
const earlyRelease = manifest.early_release;
const released = manifest.released;
return { early_release: earlyRelease.timestamps, released: released.timestamps };
const clouds = manifest.clouds;
return { early_release: earlyRelease.timestamps, released: released.timestamps, clouds: clouds.timestamps };
}
Loading